Merge pull request pypsa-meets-earth#1128 from ekatef/fix_merge

* Remove an outdated comment

* Comment-out conda distributions replaced by pip ones

* Add details for the comments

* Add atlite to pip dependencies

* Add a comment for atlite

* Add a release note

* Fix merge

---------

Co-authored-by: Davide Fioriti <67809479+davide-f@users.noreply.github.com>

doc/release_notes.rst

@@ -26,8 +26,11 @@ E.g. if a new rule becomes available describe how to use it `make test` and in o
 
 * Include a dedicated cutout for Oceania in bundle_config.yaml `PR #1157 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1157>`__
 
+* Removed duplications of devendencies in environment.yaml `PR #1128 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1128>`_
+
 * Use BASE_DIR in rules and `_helpers.py` script for facilitate module import in subworkflow `PR #1137 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1137>`__
 
+
 * Enable sector rules import in subworkflow `PR #1178 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1178>`__
 
 **Minor Changes and bug-fixing**

envs/environment.yaml

@@ -13,11 +13,14 @@ dependencies:
 - mamba   # esp for windows build
 
 - pypsa>=0.24, <0.25
-# - atlite>=0.2.4  # until https://github.com/PyPSA/atlite/issues/244 is not merged
 - dask
-- powerplantmatching
-- earth-osm>=2.1
-- atlite
+# currently the packages are being installed with pip
+# need to move back to conda once the issues will be resolved
+# - powerplantmatching
+# - earth-osm>=2.1
+# until the release will incorporate all the fixes needed
+# to work with CDS beta
+# - atlite
 
   # Dependencies of the workflow itself
 - xlrd
@@ -81,8 +84,9 @@ dependencies:
 - gurobi
 
 - pip:
-  - earth-osm>=2.2 # until conda release it out
-  - powerplantmatching>=0.5.19 # until conda release it out
+  - earth-osm>=2.2 # until conda release it out for earth-osm
+  - powerplantmatching>=0.5.19 # until conda release it out for powerplantmatching
+  - git+https://github.com/pypsa/atlite@master
   - git+https://github.com/davide-f/google-drive-downloader@master  # google drive with fix for virus scan
   - git+https://github.com/FRESNA/vresutils@master  # until new pip release > 0.3.1 (strictly)
   - tsam>=1.1.0