From f13b90523921daa7c49de04cd98a8d7821bb2169 Mon Sep 17 00:00:00 2001 From: Lukas Trippe Date: Fri, 3 Jan 2025 18:43:06 +0100 Subject: [PATCH 1/2] remove rasterio pin (#1480) --- envs/environment.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/envs/environment.yaml b/envs/environment.yaml index bee59b65f..db58e7a68 100644 --- a/envs/environment.yaml +++ b/envs/environment.yaml @@ -56,8 +56,7 @@ dependencies: # GIS dependencies: - cartopy - descartes -- rasterio==1.4.1 -- libgdal-core<3.10.0 # rasterio>=1.4.2 needed for GDAL 3.10 +- rasterio # Development dependencies - pre-commit From 6ae0257569455c69eaef467e22abcf4baa916ea2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 5 Jan 2025 14:35:14 +0100 Subject: [PATCH 2/2] Update pinned environment files for all platforms (#1482) --- envs/linux-pinned.yaml | 53 +++++++++++++------------------------ envs/macos-pinned.yaml | 57 +++++++++++++--------------------------- envs/windows-pinned.yaml | 57 ++++++++++++++-------------------------- 3 files changed, 56 insertions(+), 111 deletions(-) diff --git a/envs/linux-pinned.yaml b/envs/linux-pinned.yaml index 8693b472f..c2c6f7cf6 100644 --- a/envs/linux-pinned.yaml +++ b/envs/linux-pinned.yaml @@ -12,6 +12,7 @@ dependencies: - alsa-lib=1.2.13 - ampl-asl=1.0.0 - amply=0.1.6 + - aom=3.9.1 - appdirs=1.4.4 - argparse-dataclass=2.0.0 - asttokens=3.0.0 @@ -49,13 +50,11 @@ dependencies: - c-blosc2=2.15.2 - ca-certificates=2024.12.14 - cairo=1.18.2 - - capnproto=1.0.2 - cartopy=0.24.0 - cdsapi=0.7.5 - certifi=2024.12.14 - cffi=1.17.1 - cfgv=3.3.1 - - cfitsio=4.5.0 - cftime=1.6.4 - charset-normalizer=3.4.0 - click=8.1.8 @@ -83,6 +82,7 @@ dependencies: - dask-expr=1.1.21 - datapi=0.1.1 - datrie=0.8.2 + - dav1d=1.2.1 - dbus=1.13.6 - decorator=5.1.1 - deprecation=2.1.0 @@ -99,8 +99,7 @@ dependencies: - expat=2.6.4 - filelock=3.16.1 - fiona=1.10.1 - - fmt=11.0.2 - - folium=0.19.2 + - folium=0.19.3 - font-ttf-dejavu-sans-mono=2.37 - font-ttf-inconsolata=3.000 - font-ttf-source-code-pro=2.038 @@ -113,7 +112,6 @@ dependencies: - freexl=2.0.0 - fribidi=1.0.10 - fsspec=2024.12.0 - - gdal=3.9.3 - gdk-pixbuf=2.42.12 - geographiclib=2.0 - geojson=3.2.0 @@ -125,7 +123,7 @@ dependencies: - geotiff=1.7.3 - gflags=2.2.2 - giflib=5.2.2 - - gitdb=4.0.11 + - gitdb=4.0.12 - gitpython=3.1.43 - glog=0.7.1 - glpk=5.0 @@ -137,7 +135,7 @@ dependencies: - h2=4.1.0 - harfbuzz=10.1.0 - hdf4=4.2.15 - - hdf5=1.14.3 + - hdf5=1.14.4 - hpack=4.0.0 - humanfriendly=10.0 - hyperframe=6.0.1 @@ -158,7 +156,6 @@ dependencies: - jsonschema=4.23.0 - jsonschema-specifications=2024.10.1 - jupyter_core=5.7.2 - - kealib=1.6.1 - keyutils=1.6.1 - kiwisolver=1.4.7 - krb5=1.21.3 @@ -172,6 +169,7 @@ dependencies: - libarrow-acero=18.1.0 - libarrow-dataset=18.1.0 - libarrow-substrait=18.1.0 + - libavif16=1.1.1 - libblas=3.9.0 - libbrotlicommon=1.1.0 - libbrotlidec=1.1.0 @@ -182,6 +180,7 @@ dependencies: - libcrc32c=1.1.2 - libcups=2.3.3 - libcurl=8.11.1 + - libde265=1.0.15 - libdeflate=1.23 - libdrm=2.4.124 - libedit=3.1.20191231 @@ -193,20 +192,7 @@ dependencies: - libgcc=14.2.0 - libgcc-ng=14.2.0 - libgd=2.3.3 - - libgdal=3.9.3 - - libgdal-core=3.9.3 - - libgdal-fits=3.9.3 - - libgdal-grib=3.9.3 - - libgdal-hdf4=3.9.3 - - libgdal-hdf5=3.9.3 - - libgdal-jp2openjpeg=3.9.3 - - libgdal-kea=3.9.3 - - libgdal-netcdf=3.9.3 - - libgdal-pdf=3.9.3 - - libgdal-pg=3.9.3 - - libgdal-postgisraster=3.9.3 - - libgdal-tiledb=3.9.3 - - libgdal-xls=3.9.3 + - libgdal-core=3.10.0 - libgfortran=14.2.0 - libgfortran-ng=14.2.0 - libgfortran5=14.2.0 @@ -215,9 +201,10 @@ dependencies: - libglvnd=1.7.0 - libglx=1.7.0 - libgomp=14.2.0 - - libgoogle-cloud=2.32.0 - - libgoogle-cloud-storage=2.32.0 + - libgoogle-cloud=2.33.0 + - libgoogle-cloud-storage=2.33.0 - libgrpc=1.67.1 + - libheif=1.19.5 - libhwloc=2.11.2 - libiconv=1.17 - libjpeg-turbo=3.0.0 @@ -237,7 +224,7 @@ dependencies: - libpciaccess=0.18 - libpng=1.6.44 - libpq=17.2 - - libprotobuf=5.28.2 + - libprotobuf=5.28.3 - libre2-11=2024.07.02 - librsvg=2.58.4 - librttopo=1.1.0 @@ -288,8 +275,6 @@ dependencies: - networkx=3.4.2 - nodeenv=1.9.1 - nomkl=1.0 - - nspr=4.36 - - nss=3.107 - numexpr=2.10.2 - numpy=1.26.4 - openjpeg=2.5.3 @@ -314,9 +299,6 @@ dependencies: - platformdirs=4.3.6 - pluggy=1.5.0 - polars=1.17.1 - - poppler=24.12.0 - - poppler-data=0.4.12 - - postgresql=17.2 - powerplantmatching=0.5.19 - pre-commit=4.0.1 - progressbar2=4.5.0 @@ -354,7 +336,8 @@ dependencies: - pyyaml=6.0.2 - qhull=2020.2 - qt6-main=6.8.1 - - rasterio=1.4.1 + - rasterio=1.4.3 + - rav1e=0.6.6 - re2=2024.07.02 - readline=8.2 - referencing=0.35.1 @@ -362,6 +345,7 @@ dependencies: - reretry=0.11.8 - rioxarray=0.17.0 - rpds-py=0.22.3 + - ruff=0.8.5 - s2n=1.5.10 - scikit-learn=1.6.0 - scip=9.1.1 @@ -382,16 +366,15 @@ dependencies: - snuggs=1.4.7 - sortedcontainers=2.4.0 - soupsieve=2.5 - - spdlog=1.15.0 - sqlite=3.47.2 - stack_data=0.6.3 - statsmodels=0.14.4 + - svt-av1=2.3.0 - tabulate=0.9.0 - tbb=2022.0.0 - tblib=3.0.0 - threadpoolctl=3.5.0 - throttler=1.2.2 - - tiledb=2.27.0 - tk=8.6.13 - tomli=2.2.1 - toolz=1.0.0 @@ -400,7 +383,6 @@ dependencies: - traitlets=5.14.3 - typing-extensions=4.12.2 - typing_extensions=4.12.2 - - tzcode=2024b - tzdata=2024b - ukkonen=1.0.1 - unicodedata2=15.1.0 @@ -413,6 +395,7 @@ dependencies: - wcwidth=0.2.13 - wheel=0.45.1 - wrapt=1.17.0 + - x265=3.5 - xarray=2024.11.0 - xcb-util=0.4.1 - xcb-util-cursor=0.1.5 @@ -447,7 +430,7 @@ dependencies: - zict=3.0.0 - zipp=3.21.0 - zlib=1.3.1 - - zlib-ng=2.2.2 + - zlib-ng=2.2.3 - zstandard=0.23.0 - zstd=1.5.6 - pip: diff --git a/envs/macos-pinned.yaml b/envs/macos-pinned.yaml index 940d023c4..33a790df3 100644 --- a/envs/macos-pinned.yaml +++ b/envs/macos-pinned.yaml @@ -9,6 +9,7 @@ dependencies: - affine=2.4.0 - ampl-asl=1.0.0 - amply=0.1.6 + - aom=3.9.1 - appdirs=1.4.4 - argparse-dataclass=2.0.0 - asttokens=3.0.0 @@ -46,13 +47,11 @@ dependencies: - c-blosc2=2.15.2 - ca-certificates=2024.12.14 - cairo=1.18.2 - - capnproto=1.0.2 - cartopy=0.24.0 - cdsapi=0.7.5 - certifi=2024.12.14 - cffi=1.17.1 - cfgv=3.3.1 - - cfitsio=4.5.0 - cftime=1.6.4 - charset-normalizer=3.4.0 - click=8.1.8 @@ -73,13 +72,13 @@ dependencies: - country_converter=1.2 - cppad=20240000.7 - cycler=0.12.1 - - cyrus-sasl=2.1.27 - cytoolz=1.0.1 - dask=2024.12.1 - dask-core=2024.12.1 - dask-expr=1.1.21 - datapi=0.1.1 - datrie=0.8.2 + - dav1d=1.2.1 - decorator=5.1.1 - deprecation=2.1.0 - descartes=1.1.0 @@ -93,8 +92,7 @@ dependencies: - executing=2.1.0 - filelock=3.16.1 - fiona=1.10.1 - - fmt=11.0.2 - - folium=0.19.2 + - folium=0.19.3 - font-ttf-dejavu-sans-mono=2.37 - font-ttf-inconsolata=3.000 - font-ttf-source-code-pro=2.038 @@ -107,7 +105,6 @@ dependencies: - freexl=2.0.0 - fribidi=1.0.10 - fsspec=2024.12.0 - - gdal=3.9.3 - gdk-pixbuf=2.42.12 - geographiclib=2.0 - geojson=3.2.0 @@ -119,7 +116,7 @@ dependencies: - geotiff=1.7.3 - gflags=2.2.2 - giflib=5.2.2 - - gitdb=4.0.11 + - gitdb=4.0.12 - gitpython=3.1.43 - glog=0.7.1 - glpk=5.0 @@ -131,7 +128,7 @@ dependencies: - h2=4.1.0 - harfbuzz=10.1.0 - hdf4=4.2.15 - - hdf5=1.14.3 + - hdf5=1.14.4 - hpack=4.0.0 - humanfriendly=10.0 - hyperframe=6.0.1 @@ -152,7 +149,6 @@ dependencies: - jsonschema=4.23.0 - jsonschema-specifications=2024.10.1 - jupyter_core=5.7.2 - - kealib=1.6.1 - kiwisolver=1.4.7 - krb5=1.21.3 - lcms2=2.16 @@ -164,6 +160,7 @@ dependencies: - libarrow-acero=18.1.0 - libarrow-dataset=18.1.0 - libarrow-substrait=18.1.0 + - libavif16=1.1.1 - libblas=3.9.0 - libbrotlicommon=1.1.0 - libbrotlidec=1.1.0 @@ -172,6 +169,7 @@ dependencies: - libcrc32c=1.1.2 - libcurl=8.11.1 - libcxx=19.1.6 + - libde265=1.0.15 - libdeflate=1.23 - libedit=3.1.20191231 - libev=4.33 @@ -179,26 +177,14 @@ dependencies: - libexpat=2.6.4 - libffi=3.4.2 - libgd=2.3.3 - - libgdal=3.9.3 - - libgdal-core=3.9.3 - - libgdal-fits=3.9.3 - - libgdal-grib=3.9.3 - - libgdal-hdf4=3.9.3 - - libgdal-hdf5=3.9.3 - - libgdal-jp2openjpeg=3.9.3 - - libgdal-kea=3.9.3 - - libgdal-netcdf=3.9.3 - - libgdal-pdf=3.9.3 - - libgdal-pg=3.9.3 - - libgdal-postgisraster=3.9.3 - - libgdal-tiledb=3.9.3 - - libgdal-xls=3.9.3 + - libgdal-core=3.10.0 - libgfortran=5.0.0 - libgfortran5=13.2.0 - libglib=2.82.2 - - libgoogle-cloud=2.32.0 - - libgoogle-cloud-storage=2.32.0 + - libgoogle-cloud=2.33.0 + - libgoogle-cloud-storage=2.33.0 - libgrpc=1.67.1 + - libheif=1.19.5 - libhwloc=2.11.2 - libiconv=1.17 - libintl=0.22.5 @@ -209,12 +195,10 @@ dependencies: - liblzma=5.6.3 - libnetcdf=4.9.2 - libnghttp2=1.64.0 - - libntlm=1.8 - libopenblas=0.3.28 - libparquet=18.1.0 - libpng=1.6.44 - - libpq=17.2 - - libprotobuf=5.28.2 + - libprotobuf=5.28.3 - libre2-11=2024.07.02 - librsvg=2.58.4 - librttopo=1.1.0 @@ -257,12 +241,9 @@ dependencies: - netcdf4=1.7.2 - networkx=3.4.2 - nodeenv=1.9.1 - - nspr=4.36 - - nss=3.107 - numexpr=2.10.2 - numpy=1.26.4 - openjpeg=2.5.3 - - openldap=2.6.9 - openpyxl=3.1.5 - openssl=3.4.0 - orc=2.0.3 @@ -283,9 +264,6 @@ dependencies: - platformdirs=4.3.6 - pluggy=1.5.0 - polars=1.17.1 - - poppler=24.12.0 - - poppler-data=0.4.12 - - postgresql=17.2 - powerplantmatching=0.5.19 - pre-commit=4.0.1 - progressbar2=4.5.0 @@ -321,7 +299,8 @@ dependencies: - pyxlsb=1.0.10 - pyyaml=6.0.2 - qhull=2020.2 - - rasterio=1.4.1 + - rasterio=1.4.3 + - rav1e=0.6.6 - re2=2024.07.02 - readline=8.2 - referencing=0.35.1 @@ -329,6 +308,7 @@ dependencies: - reretry=0.11.8 - rioxarray=0.17.0 - rpds-py=0.22.3 + - ruff=0.8.5 - scikit-learn=1.6.0 - scip=9.1.1 - scipy=1.14.1 @@ -348,16 +328,15 @@ dependencies: - snuggs=1.4.7 - sortedcontainers=2.4.0 - soupsieve=2.5 - - spdlog=1.15.0 - sqlite=3.47.2 - stack_data=0.6.3 - statsmodels=0.14.4 + - svt-av1=2.3.0 - tabulate=0.9.0 - tbb=2022.0.0 - tblib=3.0.0 - threadpoolctl=3.5.0 - throttler=1.2.2 - - tiledb=2.27.0 - tk=8.6.13 - tomli=2.2.1 - toolz=1.0.0 @@ -366,7 +345,6 @@ dependencies: - traitlets=5.14.3 - typing-extensions=4.12.2 - typing_extensions=4.12.2 - - tzcode=2024b - tzdata=2024b - ukkonen=1.0.1 - unicodedata2=15.1.0 @@ -378,6 +356,7 @@ dependencies: - wcwidth=0.2.13 - wheel=0.45.1 - wrapt=1.17.0 + - x265=3.5 - xarray=2024.11.0 - xerces-c=3.2.5 - xlrd=2.0.1 @@ -389,7 +368,7 @@ dependencies: - zict=3.0.0 - zipp=3.21.0 - zlib=1.3.1 - - zlib-ng=2.2.2 + - zlib-ng=2.2.3 - zstandard=0.23.0 - zstd=1.5.6 - pip: diff --git a/envs/windows-pinned.yaml b/envs/windows-pinned.yaml index b75d5e2ac..436c6deb9 100644 --- a/envs/windows-pinned.yaml +++ b/envs/windows-pinned.yaml @@ -6,9 +6,11 @@ channels: - conda-forge - bioconda dependencies: + - _libavif_api=1.1.1 - _openmp_mutex=4.5 - affine=2.4.0 - amply=0.1.6 + - aom=3.9.1 - appdirs=1.4.4 - argparse-dataclass=2.0.0 - asttokens=3.0.0 @@ -27,10 +29,6 @@ dependencies: - aws-checksums=0.2.2 - aws-crt-cpp=0.29.7 - aws-sdk-cpp=1.11.458 - - azure-core-cpp=1.14.0 - - azure-identity-cpp=1.10.0 - - azure-storage-blobs-cpp=12.13.0 - - azure-storage-common-cpp=12.8.0 - beautifulsoup4=4.12.3 - blosc=1.21.6 - bokeh=3.6.2 @@ -44,13 +42,11 @@ dependencies: - c-blosc2=2.15.2 - ca-certificates=2024.12.14 - cairo=1.18.2 - - capnproto=1.0.2 - cartopy=0.24.0 - cdsapi=0.7.5 - certifi=2024.12.14 - cffi=1.17.1 - cfgv=3.3.1 - - cfitsio=4.5.0 - cftime=1.6.4 - charset-normalizer=3.4.0 - click=8.1.8 @@ -72,6 +68,7 @@ dependencies: - dask-expr=1.1.21 - datapi=0.1.1 - datrie=0.8.2 + - dav1d=1.2.1 - decorator=5.1.1 - deprecation=2.1.0 - descartes=1.1.0 @@ -86,8 +83,7 @@ dependencies: - executing=2.1.0 - filelock=3.16.1 - fiona=1.10.1 - - fmt=11.0.2 - - folium=0.19.2 + - folium=0.19.3 - font-ttf-dejavu-sans-mono=2.37 - font-ttf-inconsolata=3.000 - font-ttf-source-code-pro=2.038 @@ -100,7 +96,6 @@ dependencies: - freexl=2.0.0 - fribidi=1.0.10 - fsspec=2024.12.0 - - gdal=3.9.3 - geographiclib=2.0 - geojson=3.2.0 - geojson-rewind=1.1.0 @@ -110,7 +105,7 @@ dependencies: - geos=3.13.0 - geotiff=1.7.3 - getopt-win32=0.1 - - gitdb=4.0.11 + - gitdb=4.0.12 - gitpython=3.1.43 - glpk=5.0 - gmp=6.3.0 @@ -120,7 +115,7 @@ dependencies: - h2=4.1.0 - harfbuzz=10.1.0 - hdf4=4.2.15 - - hdf5=1.14.3 + - hdf5=1.14.4 - hpack=4.0.0 - humanfriendly=10.0 - hyperframe=6.0.1 @@ -140,7 +135,6 @@ dependencies: - jsonschema=4.23.0 - jsonschema-specifications=2024.10.1 - jupyter_core=5.7.2 - - kealib=1.6.1 - kiwisolver=1.4.7 - krb5=1.21.3 - lcms2=2.16 @@ -152,6 +146,7 @@ dependencies: - libarrow-acero=18.1.0 - libarrow-dataset=18.1.0 - libarrow-substrait=18.1.0 + - libavif16=1.1.1 - libblas=3.9.0 - libboost=1.86.0 - libbrotlicommon=1.1.0 @@ -161,6 +156,7 @@ dependencies: - libclang13=19.1.6 - libcrc32c=1.1.2 - libcurl=8.11.1 + - libde265=1.0.15 - libdeflate=1.23 - libevent=2.1.12 - libexpat=2.6.4 @@ -168,25 +164,13 @@ dependencies: - libflang=5.0.0 - libgcc=14.2.0 - libgd=2.3.3 - - libgdal=3.9.3 - - libgdal-core=3.9.3 - - libgdal-fits=3.9.3 - - libgdal-grib=3.9.3 - - libgdal-hdf4=3.9.3 - - libgdal-hdf5=3.9.3 - - libgdal-jp2openjpeg=3.9.3 - - libgdal-kea=3.9.3 - - libgdal-netcdf=3.9.3 - - libgdal-pdf=3.9.3 - - libgdal-pg=3.9.3 - - libgdal-postgisraster=3.9.3 - - libgdal-tiledb=3.9.3 - - libgdal-xls=3.9.3 + - libgdal-core=3.10.0 - libglib=2.82.2 - libgomp=14.2.0 - - libgoogle-cloud=2.32.0 - - libgoogle-cloud-storage=2.32.0 + - libgoogle-cloud=2.33.0 + - libgoogle-cloud-storage=2.33.0 - libgrpc=1.67.1 + - libheif=1.19.5 - libhwloc=2.11.2 - libiconv=1.17 - libintl=0.22.5 @@ -198,8 +182,7 @@ dependencies: - libopenblas=0.3.28 - libparquet=18.1.0 - libpng=1.6.44 - - libpq=17.2 - - libprotobuf=5.28.2 + - libprotobuf=5.28.3 - libre2-11=2024.07.02 - librttopo=1.1.0 - libspatialite=5.1.0 @@ -261,9 +244,6 @@ dependencies: - plac=1.4.3 - platformdirs=4.3.6 - pluggy=1.5.0 - - poppler=24.12.0 - - poppler-data=0.4.12 - - postgresql=17.2 - powerplantmatching=0.5.19 - pre-commit=4.0.1 - progressbar2=4.5.0 @@ -302,13 +282,15 @@ dependencies: - pyyaml=6.0.2 - qhull=2020.2 - qt6-main=6.8.1 - - rasterio=1.4.1 + - rasterio=1.4.3 + - rav1e=0.6.6 - re2=2024.07.02 - referencing=0.35.1 - requests=2.32.3 - reretry=0.11.8 - rioxarray=0.17.0 - rpds-py=0.22.3 + - ruff=0.8.5 - scikit-learn=1.6.0 - scip=9.1.1 - scipy=1.14.1 @@ -328,16 +310,15 @@ dependencies: - snuggs=1.4.7 - sortedcontainers=2.4.0 - soupsieve=2.5 - - spdlog=1.15.0 - sqlite=3.47.2 - stack_data=0.6.3 - statsmodels=0.14.4 + - svt-av1=2.3.0 - tabulate=0.9.0 - tbb=2022.0.0 - tblib=3.0.0 - threadpoolctl=3.5.0 - throttler=1.2.2 - - tiledb=2.27.0 - tk=8.6.13 - tomli=2.2.1 - toolz=1.0.0 @@ -362,6 +343,7 @@ dependencies: - wheel=0.45.1 - win_inet_pton=1.1.0 - wrapt=1.17.0 + - x265=3.5 - xarray=2024.11.0 - xerces-c=3.2.5 - xlrd=2.0.1 @@ -379,7 +361,7 @@ dependencies: - zict=3.0.0 - zipp=3.21.0 - zlib=1.3.1 - - zlib-ng=2.2.2 + - zlib-ng=2.2.3 - zstandard=0.23.0 - zstd=1.5.6 - pip: @@ -396,3 +378,4 @@ dependencies: - snakemake-storage-plugin-http==0.2.3 - tsam==2.3.6 prefix: C:\Miniconda\envs\pypsa-eur +