Skip to content

Commit

Permalink
Merge branch 'master' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
fneum authored Feb 12, 2025
2 parents d4bd3db + 092c28b commit 7ceccf2
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 42 deletions.
31 changes: 18 additions & 13 deletions envs/linux-pinned.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ dependencies:
- argon2-cffi-bindings=21.2.0
- argparse-dataclass=2.0.0
- arrow=1.3.0
- astroid=3.3.8
- asttokens=3.0.0
- async-lru=2.0.4
- at-spi2-atk=2.38.0
- at-spi2-core=2.40.3
- atk-1.0=2.38.0
- atlite=0.3.0
- atlite=0.4.0
- attrs=25.1.0
- aws-c-auth=0.8.1
- aws-c-cal=0.8.1
Expand Down Expand Up @@ -100,11 +101,13 @@ dependencies:
- defusedxml=0.7.1
- deprecation=2.1.0
- descartes=1.1.0
- dill=0.3.9
- distlib=0.3.9
- distributed=2025.1.0
- docutils=0.21.2
- double-conversion=3.3.0
- dpath=2.2.0
- entsoe-py=0.6.18
- epoxy=1.5.10
- et_xmlfile=2.0.0
- exceptiongroup=1.2.2
Expand All @@ -120,7 +123,7 @@ dependencies:
- fontconfig=2.15.0
- fonts-conda-ecosystem=1
- fonts-conda-forge=1
- fonttools=4.55.8
- fonttools=4.56.0
- fqdn=1.5.1
- freetype=2.12.1
- freexl=2.0.0
Expand All @@ -129,7 +132,6 @@ dependencies:
- gdk-pixbuf=2.42.12
- geographiclib=2.0
- geojson=3.2.0
- geojson-rewind=1.1.0
- geopandas=1.0.1
- geopandas-base=1.0.1
- geopy=2.4.1
Expand Down Expand Up @@ -160,7 +162,7 @@ dependencies:
- humanfriendly=10.0
- hyperframe=6.1.0
- icu=75.1
- identify=2.6.6
- identify=2.6.7
- idna=3.10
- immutables=0.21
- importlib-metadata=8.6.1
Expand All @@ -170,6 +172,7 @@ dependencies:
- ipython=8.32.0
- ipywidgets=8.1.5
- isoduration=20.11.0
- isort=6.0.0
- jedi=0.19.2
- jinja2=3.1.5
- joblib=1.4.2
Expand All @@ -195,7 +198,7 @@ dependencies:
- keyutils=1.6.1
- kiwisolver=1.4.8
- krb5=1.21.3
- lcms2=2.16
- lcms2=2.17
- ld_impl_linux-64=2.43
- lerc=4.0.0
- libabseil=20240722.0
Expand Down Expand Up @@ -269,7 +272,7 @@ dependencies:
- librttopo=1.1.0
- libsodium=1.0.20
- libspatialite=5.1.0
- libsqlite=3.48.0
- libsqlite=3.49.0
- libssh2=1.11.1
- libstdcxx=14.2.0
- libstdcxx-ng=14.2.0
Expand All @@ -296,6 +299,7 @@ dependencies:
- matplotlib=3.10.0
- matplotlib-base=3.10.0
- matplotlib-inline=0.1.7
- mccabe=0.7.0
- memory_profiler=0.61.0
- minizip=4.0.7
- mistune=3.1.1
Expand Down Expand Up @@ -335,13 +339,13 @@ dependencies:
- pexpect=4.9.0
- pickleshare=0.7.5
- pillow=11.1.0
- pip=25.0
- pip=25.0.1
- pixman=0.44.2
- pkgutil-resolve-name=1.3.10
- plac=1.4.3
- platformdirs=4.3.6
- pluggy=1.5.0
- polars=1.21.0
- polars=1.22.0
- powerplantmatching=0.7.1
- pre-commit=4.1.0
- progressbar2=4.5.0
Expand All @@ -361,10 +365,11 @@ dependencies:
- pycountry=24.6.1
- pycparser=2.22
- pygments=2.19.1
- pylint=3.3.4
- pyogrio=0.10.0
- pyparsing=3.2.1
- pyproj=3.7.0
- pypsa=0.32.1
- pypsa=0.33.0
- pyshp=2.3.1
- pyside6=6.8.2
- pysocks=1.7.1
Expand Down Expand Up @@ -394,7 +399,7 @@ dependencies:
- rfc3986-validator=0.1.1
- rioxarray=0.18.2
- rpds-py=0.22.3
- ruff=0.9.4
- ruff=0.9.5
- s2n=1.5.11
- scikit-learn=1.6.1
- scipy=1.15.1
Expand All @@ -416,7 +421,7 @@ dependencies:
- snuggs=1.4.7
- sortedcontainers=2.4.0
- soupsieve=2.5
- sqlite=3.48.0
- sqlite=3.49.0
- stack_data=0.6.3
- statsmodels=0.14.4
- svt-av1=2.3.0
Expand All @@ -428,6 +433,7 @@ dependencies:
- tinycss2=1.4.0
- tk=8.6.13
- tomli=2.2.1
- tomlkit=0.13.2
- toolz=1.0.0
- tornado=6.4.2
- tqdm=4.67.1
Expand Down Expand Up @@ -491,12 +497,11 @@ dependencies:
- zstandard=0.23.0
- zstd=1.5.6
- pip:
- entsoe-py==0.6.18
- gurobipy==12.0.1
- oauthlib==3.2.2
- ply==3.11
- pyomo==6.8.2
- pyscipopt==5.2.1
- pyscipopt==5.3.0
- requests-oauthlib==1.3.1
- snakemake-executor-plugin-cluster-generic==1.0.9
- snakemake-executor-plugin-slurm==0.15.0
Expand Down
37 changes: 21 additions & 16 deletions envs/macos-pinned.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ dependencies:
- argon2-cffi-bindings=21.2.0
- argparse-dataclass=2.0.0
- arrow=1.3.0
- astroid=3.3.8
- asttokens=3.0.0
- async-lru=2.0.4
- atk-1.0=2.38.0
- atlite=0.3.0
- atlite=0.4.0
- attrs=25.1.0
- aws-c-auth=0.8.1
- aws-c-cal=0.8.1
Expand Down Expand Up @@ -94,10 +95,12 @@ dependencies:
- defusedxml=0.7.1
- deprecation=2.1.0
- descartes=1.1.0
- dill=0.3.9
- distlib=0.3.9
- distributed=2025.1.0
- docutils=0.21.2
- dpath=2.2.0
- entsoe-py=0.6.18
- epoxy=1.5.10
- et_xmlfile=2.0.0
- exceptiongroup=1.2.2
Expand All @@ -112,7 +115,7 @@ dependencies:
- fontconfig=2.15.0
- fonts-conda-ecosystem=1
- fonts-conda-forge=1
- fonttools=4.55.8
- fonttools=4.56.0
- fqdn=1.5.1
- freetype=2.12.1
- freexl=2.0.0
Expand All @@ -121,7 +124,6 @@ dependencies:
- gdk-pixbuf=2.42.12
- geographiclib=2.0
- geojson=3.2.0
- geojson-rewind=1.1.0
- geopandas=1.0.1
- geopandas-base=1.0.1
- geopy=2.4.1
Expand Down Expand Up @@ -152,7 +154,7 @@ dependencies:
- humanfriendly=10.0
- hyperframe=6.1.0
- icu=75.1
- identify=2.6.6
- identify=2.6.7
- idna=3.10
- immutables=0.21
- importlib-metadata=8.6.1
Expand All @@ -162,6 +164,7 @@ dependencies:
- ipython=8.32.0
- ipywidgets=8.1.5
- isoduration=20.11.0
- isort=6.0.0
- jedi=0.19.2
- jinja2=3.1.5
- joblib=1.4.2
Expand All @@ -186,7 +189,7 @@ dependencies:
- jupyterlab_widgets=3.0.13
- kiwisolver=1.4.8
- krb5=1.21.3
- lcms2=2.16
- lcms2=2.17
- lerc=4.0.0
- libabseil=20240722.0
- libaec=1.1.3
Expand All @@ -195,7 +198,7 @@ dependencies:
- libarrow-acero=19.0.0
- libarrow-dataset=19.0.0
- libarrow-substrait=19.0.0
- libasprintf=0.22.5
- libasprintf=0.23.1
- libavif16=1.1.1
- libblas=3.9.0
- libbrotlicommon=1.1.0
Expand All @@ -217,7 +220,7 @@ dependencies:
- libgdal-hdf4=3.10.1
- libgdal-hdf5=3.10.1
- libgdal-netcdf=3.10.1
- libgettextpo=0.22.5
- libgettextpo=0.23.1
- libgfortran=5.0.0
- libgfortran5=13.2.0
- libglib=2.82.2
Expand All @@ -226,7 +229,7 @@ dependencies:
- libgrpc=1.67.1
- libheif=1.19.5
- libiconv=1.17
- libintl=0.22.5
- libintl=0.23.1
- libjpeg-turbo=3.0.0
- libkml=1.3.0
- liblapack=3.9.0
Expand All @@ -245,7 +248,7 @@ dependencies:
- librttopo=1.1.0
- libsodium=1.0.20
- libspatialite=5.1.0
- libsqlite=3.48.0
- libsqlite=3.49.0
- libssh2=1.11.1
- libthrift=0.21.0
- libtiff=4.7.0
Expand All @@ -268,6 +271,7 @@ dependencies:
- matplotlib=3.10.0
- matplotlib-base=3.10.0
- matplotlib-inline=0.1.7
- mccabe=0.7.0
- memory_profiler=0.61.0
- minizip=4.0.7
- mistune=3.1.1
Expand Down Expand Up @@ -303,13 +307,13 @@ dependencies:
- pexpect=4.9.0
- pickleshare=0.7.5
- pillow=11.1.0
- pip=25.0
- pip=25.0.1
- pixman=0.44.2
- pkgutil-resolve-name=1.3.10
- plac=1.4.3
- platformdirs=4.3.6
- pluggy=1.5.0
- polars=1.21.0
- polars=1.22.0
- powerplantmatching=0.7.1
- pre-commit=4.1.0
- progressbar2=4.5.0
Expand All @@ -329,12 +333,13 @@ dependencies:
- pycountry=24.6.1
- pycparser=2.22
- pygments=2.19.1
- pylint=3.3.4
- pyobjc-core=11.0
- pyobjc-framework-cocoa=11.0
- pyogrio=0.10.0
- pyparsing=3.2.1
- pyproj=3.7.0
- pypsa=0.32.1
- pypsa=0.33.0
- pyshp=2.3.1
- pysocks=1.7.1
- pytables=3.10.2
Expand Down Expand Up @@ -362,7 +367,7 @@ dependencies:
- rfc3986-validator=0.1.1
- rioxarray=0.18.2
- rpds-py=0.22.3
- ruff=0.9.4
- ruff=0.9.5
- scikit-learn=1.6.1
- scipy=1.15.1
- seaborn=0.13.2
Expand All @@ -383,7 +388,7 @@ dependencies:
- snuggs=1.4.7
- sortedcontainers=2.4.0
- soupsieve=2.5
- sqlite=3.48.0
- sqlite=3.49.0
- stack_data=0.6.3
- statsmodels=0.14.4
- svt-av1=2.3.0
Expand All @@ -395,6 +400,7 @@ dependencies:
- tinycss2=1.4.0
- tk=8.6.13
- tomli=2.2.1
- tomlkit=0.13.2
- toolz=1.0.0
- tornado=6.4.2
- tqdm=4.67.1
Expand Down Expand Up @@ -436,12 +442,11 @@ dependencies:
- zstandard=0.23.0
- zstd=1.5.6
- pip:
- entsoe-py==0.6.18
- gurobipy==12.0.1
- oauthlib==3.2.2
- ply==3.11
- pyomo==6.8.2
- pyscipopt==5.2.1
- pyscipopt==5.3.0
- requests-oauthlib==1.3.1
- snakemake-executor-plugin-cluster-generic==1.0.9
- snakemake-executor-plugin-slurm==0.15.0
Expand Down
Loading

0 comments on commit 7ceccf2

Please sign in to comment.