Merge remote-tracking branch 'origin/fix_env' into test_linopy_latest…

…_gpd

.github/workflows/main.yml

@@ -1,11 +1,13 @@
 on:
   schedule:
-  - cron: "0 5 * * 0"
+  - cron: "0 5 1 * *"
+  workflow_dispatch:
 
 jobs:
   contrib-readme-job:
     runs-on: ubuntu-latest
     name: A job to automate contrib in readme
+    if: ${{ github.repository_owner == 'pypsa-meets-earth' && github.ref == 'refs/heads/main'}}
     steps:
     - name: Contribute List
       uses: akhilmhdh/[email protected]

README.md

@@ -23,7 +23,7 @@ by
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/pypsa-meets-earth/pypsa-earth/main.svg)](https://results.pre-commit.ci/latest/github/pypsa-meets-earth/pypsa-earth/main)
 [![Discord](https://img.shields.io/discord/911692131440148490?logo=discord)](https://discord.gg/AnuJBk23FU)
-[![Google Drive](https://img.shields.io/badge/Google%20Drive-4285F4?style=flat&logo=googledrive&logoColor=white)](https://drive.google.com/drive/folders/1U7fgktbxlaGzWxT2C0-Xv-_ffWCxAKZz)
+[![Google Drive](https://img.shields.io/badge/Google%20Drive-4285F4?style=flat&logo=googledrive&logoColor=white)](https://drive.google.com/drive/folders/13Z8Y9zgsh5IZaDNkkRyo1wkoMgbdUxT5?usp=sharing)
 
 **PyPSA-Earth: A Global Sector-Coupled Open-Source Multi-Energy System Model**
 

configs/bundle_config.yaml

@@ -36,11 +36,15 @@ databundles:
     category: data
     destination: "data"
     urls:
-      zenodo: https://sandbox.zenodo.org/records/3853/files/bundle_tutorial_NGBJ.zip?download=1
-      gdrive: https://drive.google.com/file/d/1Vb1ISjhy7iwTTZYeezGd6S4nLt-EDGme/view?usp=drive_link
+      zenodo: https://sandbox.zenodo.org/records/145504/files/bundle_tutorial_NGBJ_with_gadmlike.zip?download=1
+      gdrive: https://drive.google.com/file/d/12K03Epx3O9o-IQLh9afzCQyT-nMKWM3P/view?usp=drive_link
     output:
     - data/gebco/GEBCO_2021_TID.nc
     - data/copernicus/PROBAV_LC100_global_v3.0.1_2019-nrt_Discrete-Classification-map_EPSG-4326.tif
+    - data/gadm/gadm41_NGA/gadm41_NGA.gpkg  # needed in build_shapes
+    - data/gadm/gadm41_BEN/gadm41_BEN.gpkg  # needed in build_shapes
+    - data/gadm/gadm36_NGA/gadm36_NGA.gpkg  # needed in sector-coupled model
+    - data/gadm/gadm36_BEN/gadm36_BEN.gpkg  # needed in sector-coupled model
 
   # tutorial bundle specific for Botswana only
   bundle_tutorial_BW:
@@ -49,11 +53,13 @@ databundles:
     category: data
     destination: "data"
     urls:
-      zenodo: https://sandbox.zenodo.org/records/3853/files/bundle_tutorial_BW.zip?download=1
-      gdrive: https://drive.google.com/file/d/19IXvTD8gVSzgTInL85ta7QjaNI8ZPCCY/view?usp=drive_link
+      zenodo: https://sandbox.zenodo.org/records/145504/files/bundle_tutorial_BW_with_gadmlike.zip?download=1
+      gdrive: https://drive.google.com/file/d/1YbbYGs1NsSsZYqNX1g1Jo-iJzt5m-81c/view?usp=drive_link
     output:
     - data/gebco/GEBCO_2021_TID.nc
     - data/copernicus/PROBAV_LC100_global_v3.0.1_2019-nrt_Discrete-Classification-map_EPSG-4326.tif
+    - data/gadm/gadm41_BWA/gadm41_BWA.gpkg  # needed in build_shapes
+    - data/gadm/gadm36_BWA/gadm36_BWA.gpkg  # needed in sector-coupled model
 
   # tutorial bundle specific for Morocco only
   bundle_tutorial_MA:
@@ -364,3 +370,32 @@ databundles:
     urls:
       protectedplanet: https://d1gam3xoknrgr2.cloudfront.net/current/WDPA_{month:s}{year:d}_Public_shp.zip
     output: [data/landcover/world_protected_areas/*]
+
+  # Backup tutorial bundles with no gadm-like data; for reference:
+  # https://github.com/pypsa-meets-earth/pypsa-earth/issues/1258
+  #
+  # # tutorial bundle specific for Nigeria and Benin only, without gadm-like data
+  # bundle_tutorial_NGBJ:
+  #   countries: [NG, BJ]
+  #   tutorial: true
+  #   category: data
+  #   destination: "data"
+  #   urls:
+  #     zenodo: https://sandbox.zenodo.org/records/3853/files/bundle_tutorial_NGBJ.zip?download=1
+  #     gdrive: https://drive.google.com/file/d/1Vb1ISjhy7iwTTZYeezGd6S4nLt-EDGme/view?usp=drive_link
+  #   output:
+  #   - data/gebco/GEBCO_2021_TID.nc
+  #   - data/copernicus/PROBAV_LC100_global_v3.0.1_2019-nrt_Discrete-Classification-map_EPSG-4326.tif
+
+  # # tutorial bundle specific for Botswana only, without gadm-like data
+  # bundle_tutorial_BW:
+  #   countries: [BW]
+  #   tutorial: true
+  #   category: data
+  #   destination: "data"
+  #   urls:
+  #     zenodo: https://sandbox.zenodo.org/records/3853/files/bundle_tutorial_BW.zip?download=1
+  #     gdrive: https://drive.google.com/file/d/19IXvTD8gVSzgTInL85ta7QjaNI8ZPCCY/view?usp=drive_link
+  #   output:
+  #   - data/gebco/GEBCO_2021_TID.nc
+  #   - data/copernicus/PROBAV_LC100_global_v3.0.1_2019-nrt_Discrete-Classification-map_EPSG-4326.tif

doc/release_notes.rst

@@ -19,6 +19,9 @@ This part of documentation collects descriptive release notes to capture the mai
 
 **Minor Changes and bug-fixing**
 
+* Added electricity bus to Fischer-Tropsch in prepare_sector_network.py `PR #1226 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1226>`__
+
+* Update BW, NG and BJ tutorial databundles to include gadm-like sources from geoboundaries `PR #1257 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1257>`__
 
 
 PyPSA-Earth 0.5.0

doc/requirements.txt

@@ -8,7 +8,7 @@ sphinx_book_theme
 sphinxcontrib-bibtex
 myst-parser  # recommark is deprecated, https://stackoverflow.com/a/71660856/13573820
 
-pypsa
+pypsa >=0.24, <0.25
 vresutils>=0.3.1
 powerplantmatching>=0.5.5
 atlite>=0.2.9
@@ -33,7 +33,9 @@ gitpython
 chaospy
 numba
 ruamel.yaml<=0.17.26
-earth-osm>=0.1.0, <0.2.0
+earth-osm>=2.3.post1
 reverse-geocode
 pyDOE2
-# graphviz
+graphviz
+
+fake_useragent

envs/environment.yaml

@@ -18,9 +18,7 @@ dependencies:
 # currently the packages are being installed with pip
 # need to move back to conda once the issues will be resolved
 - powerplantmatching>=0.5.19
-# - earth-osm>=2.1
-# until the release will incorporate all the fixes needed
-# to work with CDS beta
+- earth-osm>=2.3.post1
 - atlite>=0.3
 
   # Dependencies of the workflow itself
@@ -37,8 +35,8 @@ dependencies:
 # starting from 1.3.5 numpoly requires numpy>2.0 which leads to issues
 - numpoly<=1.3.4
 - pandas
-- geopandas>=0.11.0, <=0.14.3
-- fiona<1.10.0
+- geopandas>=1
+- fiona>=1.10
 - xarray>=2023.11.0, <2023.12.0
 - netcdf4
 - networkx
@@ -87,7 +85,6 @@ dependencies:
 - gurobi
 
 - pip:
-  - earth-osm==2.2 # until conda release it out for earth-osm
   - git+https://github.com/davide-f/google-drive-downloader@master  # google drive with fix for virus scan
   - tsam>=1.1.0
   - chaospy  # lastest version only available on pip

envs/linux-pinned.yaml

@@ -73,7 +73,7 @@ dependencies:
 - cfitsio=4.4.1
 - cftime=1.6.4
 - charset-normalizer=3.4.0
-- click=8.1.7
+- click=8.1.8
 - click-plugins=1.1.1
 - cligj=0.7.2
 - cloudpickle=3.1.0
@@ -112,14 +112,15 @@ dependencies:
 - distributed=2024.12.1
 - docutils=0.21.2
 - dpath=2.2.0
+- earth-osm=2.3.post1
 - entrypoints=0.4
 - entsoe-py=0.6.11
 - et_xmlfile=2.0.0
 - exceptiongroup=1.2.2
 - executing=2.1.0
 - expat=2.6.4
 - filelock=3.16.1
-- fiona=1.9.6
+- fiona=1.10.1
 - fmt=11.0.2
 - folium=0.19.2
 - font-ttf-dejavu-sans-mono=2.37
@@ -140,8 +141,8 @@ dependencies:
 - gdk-pixbuf=2.42.12
 - geographiclib=2.0
 - geojson-rewind=1.1.0
-- geopandas=0.14.3
-- geopandas-base=0.14.3
+- geopandas=1.0.1
+- geopandas-base=1.0.1
 - geopy=2.4.1
 - geos=3.13.0
 - geotiff=1.7.3
@@ -167,7 +168,7 @@ dependencies:
 - gurobi=12.0.0
 - h11=0.14.0
 - h2=4.1.0
-- harfbuzz=9.0.0
+- harfbuzz=10.1.0
 - hdf4=4.2.15
 - hdf5=1.14.3
 - holoviews=1.20.0
@@ -183,14 +184,14 @@ dependencies:
 - importlib-metadata=8.5.0
 - importlib_metadata=8.5.0
 - importlib_resources=6.4.5
-- inflate64=1.0.0
+- inflate64=1.0.1
 - iniconfig=2.0.0
 - ipopt=3.14.17
 - ipykernel=6.29.5
 - ipython=8.31.0
 - isoduration=20.11.0
 - jedi=0.19.2
-- jinja2=3.1.4
+- jinja2=3.1.5
 - joblib=1.4.2
 - json-c=0.18
 - json5=0.10.0
@@ -306,7 +307,6 @@ dependencies:
 - libsndfile=1.2.2
 - libsodium=1.0.20
 - libsolv=0.7.30
-- libspatialindex=2.0.0
 - libspatialite=5.1.0
 - libspral=2024.05.08
 - libsqlite=3.47.2
@@ -414,6 +414,7 @@ dependencies:
 - proj=9.5.1
 - prometheus_client=0.21.1
 - prompt-toolkit=3.0.48
+- protobuf=5.28.2
 - psutil=6.1.0
 - pthread-stubs=0.4
 - ptyprocess=0.7.0
@@ -424,7 +425,7 @@ dependencies:
 - py7zr=0.22.0
 - pyarrow=18.1.0
 - pyarrow-core=18.1.0
-- pybcj=1.0.2
+- pybcj=1.0.3
 - pycountry=24.6.1
 - pycparser=2.22
 - pycryptodomex=3.21.0
@@ -470,7 +471,6 @@ dependencies:
 - rfc3986-validator=0.1.1
 - rioxarray=0.17.0
 - rpds-py=0.22.3
-- rtree=1.3.0
 - ruamel.yaml=0.17.26
 - ruamel.yaml.clib=0.2.8
 - s2n=1.5.10
@@ -527,7 +527,7 @@ dependencies:
 - unidecode=1.3.8
 - uri-template=1.3.0
 - uriparser=0.9.8
-- urllib3=2.2.3
+- urllib3=2.3.0
 - validators=0.34.0
 - virtualenv=20.28.0
 - wcwidth=0.2.13
@@ -555,7 +555,6 @@ dependencies:
 - xorg-libxfixes=6.0.1
 - xorg-libxrender=0.9.12
 - xorg-libxxf86vm=1.1.6
-- xorg-xf86vidmodeproto=2.3.1
 - xyzservices=2024.9.0
 - xz=5.6.3
 - xz-gpl-tools=5.6.3
@@ -573,10 +572,8 @@ dependencies:
 - zstd=1.5.6
 - pip:
   - chaospy==4.3.17
-  - earth-osm==2.2
   - fake-useragent==2.0.3
   - googledrivedownloader==0.4
   - highspy==1.9.0
-  - protobuf==5.29.2
   - tsam==2.3.6
 prefix: /usr/share/miniconda/envs/pypsa-earth

envs/macos-pinned.yaml

@@ -70,7 +70,7 @@ dependencies:
 - cfitsio=4.4.1
 - cftime=1.6.4
 - charset-normalizer=3.4.0
-- click=8.1.7
+- click=8.1.8
 - click-plugins=1.1.1
 - cligj=0.7.2
 - cloudpickle=3.1.0
@@ -108,13 +108,14 @@ dependencies:
 - distributed=2024.12.1
 - docutils=0.21.2
 - dpath=2.2.0
+- earth-osm=2.3.post1
 - entrypoints=0.4
 - entsoe-py=0.6.11
 - et_xmlfile=2.0.0
 - exceptiongroup=1.2.2
 - executing=2.1.0
 - filelock=3.16.1
-- fiona=1.9.6
+- fiona=1.10.1
 - fmt=11.0.2
 - folium=0.19.2
 - font-ttf-dejavu-sans-mono=2.37
@@ -135,8 +136,8 @@ dependencies:
 - gdk-pixbuf=2.42.12
 - geographiclib=2.0
 - geojson-rewind=1.1.0
-- geopandas=0.14.3
-- geopandas-base=0.14.3
+- geopandas=1.0.1
+- geopandas-base=1.0.1
 - geopy=2.4.1
 - geos=3.13.0
 - geotiff=1.7.3
@@ -172,14 +173,14 @@ dependencies:
 - importlib-metadata=8.5.0
 - importlib_metadata=8.5.0
 - importlib_resources=6.4.5
-- inflate64=1.0.0
+- inflate64=1.0.1
 - iniconfig=2.0.0
 - ipopt=3.14.17
 - ipykernel=6.29.5
 - ipython=8.31.0
 - isoduration=20.11.0
 - jedi=0.19.2
-- jinja2=3.1.4
+- jinja2=3.1.5
 - joblib=1.4.2
 - json-c=0.18
 - json5=0.10.0
@@ -267,7 +268,6 @@ dependencies:
 - libscotch=7.0.5
 - libsodium=1.0.20
 - libsolv=0.7.30
-- libspatialindex=2.0.0
 - libspatialite=5.1.0
 - libsqlite=3.47.2
 - libssh2=1.11.1
@@ -364,6 +364,7 @@ dependencies:
 - proj=9.5.1
 - prometheus_client=0.21.1
 - prompt-toolkit=3.0.48
+- protobuf=5.28.2
 - psutil=6.1.0
 - pthread-stubs=0.4
 - ptyprocess=0.7.0
@@ -373,7 +374,7 @@ dependencies:
 - py7zr=0.22.0
 - pyarrow=18.1.0
 - pyarrow-core=18.1.0
-- pybcj=1.0.2
+- pybcj=1.0.3
 - pycountry=24.6.1
 - pycparser=2.22
 - pycryptodomex=3.21.0
@@ -418,7 +419,6 @@ dependencies:
 - rfc3986-validator=0.1.1
 - rioxarray=0.17.0
 - rpds-py=0.22.3
-- rtree=1.3.0
 - ruamel.yaml=0.17.26
 - ruamel.yaml.clib=0.2.8
 - scikit-learn=1.6.0
@@ -472,7 +472,7 @@ dependencies:
 - unidecode=1.3.8
 - uri-template=1.3.0
 - uriparser=0.9.8
-- urllib3=2.2.3
+- urllib3=2.3.0
 - validators=0.34.0
 - virtualenv=20.28.0
 - wcwidth=0.2.13
@@ -500,10 +500,8 @@ dependencies:
 - zstd=1.5.6
 - pip:
   - chaospy==4.3.17
-  - earth-osm==2.2
   - fake-useragent==2.0.3
   - googledrivedownloader==0.4
   - highspy==1.9.0
-  - protobuf==5.29.2
   - tsam==2.3.6
 prefix: /Users/runner/miniconda3/envs/pypsa-earth