Skip to content

Commit

Permalink
Merge branch 'master' into cutout-dir
Browse files Browse the repository at this point in the history
  • Loading branch information
@fneum
fneum authored Feb 6, 2025
2 parents c92487d + a12d724 commit e776e6e
Show file tree
Hide file tree
Showing 19 changed files with 138 additions and 180 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ repos:
# Run ruff to lint and format
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.9.2
rev: v0.9.3
hooks:
# Run the linter.
- id: ruff
Expand All @@ -24,7 +24,7 @@ repos:

# Find common spelling mistakes in comments and docstrings
- repo: https://github.com/codespell-project/codespell
rev: v2.3.0
rev: v2.4.0
hooks:
- id: codespell
args: ['--ignore-regex="(\b[A-Z]+\b)"', '--ignore-words-list=fom,appartment,bage,ore,setis,tabacco,berfore,vor,pris'] # Ignore capital case words, e.g. country codes
Expand Down
6 changes: 6 additions & 0 deletions config/config.default.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -964,6 +964,12 @@ solving:
ipm_optimality_tolerance: 1e-4
parallel: "on"
random_seed: 123
highs-simplex:
solver: "simplex"
parallel: "on"
primal_feasibility_tolerance: 1e-5
dual_feasibility_tolerance: 1e-5
random_seed: 123
gurobi-default:
threads: 8
method: 2 # barrier
Expand Down
4 changes: 2 additions & 2 deletions config/test/config.electricity.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ lines:
solving:
solver:
name: highs
options: highs-default
options: highs-simplex

check_objective:
enable: false
enable: true
expected_value: 3.8120188094e+07

plotting:
Expand Down
2 changes: 1 addition & 1 deletion config/test/config.myopic.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ industry:
solving:
solver:
name: highs
options: highs-default
options: highs-simplex
mem: 4000

plotting:
Expand Down
6 changes: 3 additions & 3 deletions config/test/config.overnight.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ industry:
solving:
solver:
name: highs
options: highs-default
options: highs-simplex
mem: 4000

check_objective:
enable: false
expected_value: 7.0847670388e+08
enable: true
expected_value: 6.96e+08

plotting:
map:
Expand Down
6 changes: 3 additions & 3 deletions config/test/config.perfect.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ industry:
solving:
solver:
name: highs
options: highs-default
options: highs-simplex
mem: 4000

check_objective:
enable: false
expected_value: 1.4427662256e+10
enable: true
expected_value: 1.3778753459e+10

plotting:
map:
Expand Down
2 changes: 1 addition & 1 deletion config/test/config.scenarios.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ renewable:
solving:
solver:
name: highs
options: highs-default
options: highs-simplex
7 changes: 2 additions & 5 deletions envs/environment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ dependencies:
- scipy
- glpk
- shapely>=2.0
- pyscipopt
- scip!=9.2.0 # dependency of pyscipopt, temporary fix
- matplotlib
- proj
- fiona
Expand All @@ -51,21 +49,20 @@ dependencies:
- graphviz
- geojson

# Keep in conda environment when calling ipython
- ipython

# GIS dependencies:
- cartopy
- descartes
- rasterio

# Development dependencies
- ipython
- pre-commit
- ruff

- pip:
- gurobipy
- highspy<1.8
- pyscipopt # See https://github.com/scipopt/PySCIPOpt/issues/944
- tsam>=2.3.1
- snakemake-storage-plugin-http
- snakemake-executor-plugin-slurm
Expand Down
67 changes: 29 additions & 38 deletions envs/linux-pinned.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,19 @@ channels:
dependencies:
- _libgcc_mutex=0.1
- _openmp_mutex=4.5
- adwaita-icon-theme=47.0
- affine=2.4.0
- 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
- at-spi2-atk=2.38.0
- at-spi2-core=2.40.3
- atk-1.0=2.38.0
- atlite=0.3.0
- attrs=24.3.0
- attrs=25.1.0
- aws-c-auth=0.8.1
- aws-c-cal=0.8.1
- aws-c-common=0.10.6
Expand All @@ -37,7 +39,7 @@ dependencies:
- azure-storage-blobs-cpp=12.13.0
- azure-storage-common-cpp=12.8.0
- azure-storage-files-datalake-cpp=12.12.0
- beautifulsoup4=4.12.3
- beautifulsoup4=4.13.0
- blosc=1.21.6
- bokeh=3.6.2
- bottleneck=1.4.2
Expand All @@ -48,7 +50,7 @@ dependencies:
- bzip2=1.0.8
- c-ares=1.34.4
- c-blosc2=2.15.2
- ca-certificates=2024.12.14
- ca-certificates=2025.1.31
- cairo=1.18.2
- cartopy=0.24.0
- cdsapi=0.7.5
Expand All @@ -73,13 +75,12 @@ dependencies:
- connection_pool=0.0.3
- contourpy=1.3.1
- country_converter=1.2
- cppad=20240000.7
- cycler=0.12.1
- cyrus-sasl=2.1.27
- cytoolz=1.0.1
- dask=2025.1.0
- dask-core=2025.1.0
- datapi=0.1.2
- datapi=0.2.0
- datrie=0.8.2
- dav1d=1.2.1
- dbus=1.13.6
Expand All @@ -92,6 +93,7 @@ dependencies:
- double-conversion=3.3.0
- dpath=2.2.0
- entsoe-py=0.6.11
- epoxy=1.5.10
- et_xmlfile=2.0.0
- exceptiongroup=1.2.2
- executing=2.1.0
Expand All @@ -106,11 +108,11 @@ dependencies:
- fontconfig=2.15.0
- fonts-conda-ecosystem=1
- fonts-conda-forge=1
- fonttools=4.55.4
- fonttools=4.55.8
- freetype=2.12.1
- freexl=2.0.0
- fribidi=1.0.10
- fsspec=2024.12.0
- fsspec=2025.2.0
- gdk-pixbuf=2.42.12
- geographiclib=2.0
- geojson=3.2.0
Expand All @@ -124,17 +126,19 @@ dependencies:
- giflib=5.2.2
- gitdb=4.0.12
- gitpython=3.1.44
- glib-tools=2.82.2
- glog=0.7.1
- glpk=5.0
- gmp=6.3.0
- graphite2=1.3.13
- graphviz=12.0.0
- gtk2=2.24.33
- graphviz=12.2.1
- gtk3=3.24.43
- gts=0.7.6
- h2=4.1.0
- harfbuzz=10.2.0
- hdf4=4.2.15
- hdf5=1.14.3
- hicolor-icon-theme=0.17
- hpack=4.1.0
- humanfriendly=10.0
- hyperframe=6.1.0
Expand All @@ -145,12 +149,11 @@ dependencies:
- importlib-metadata=8.6.1
- importlib_resources=6.5.2
- iniconfig=2.0.0
- ipopt=3.14.16
- ipython=8.31.0
- ipython=8.32.0
- jedi=0.19.2
- jinja2=3.1.5
- joblib=1.4.2
- jpype1=1.5.1
- jpype1=1.5.2
- json-c=0.18
- jsonschema=4.23.0
- jsonschema-specifications=2024.10.1
Expand Down Expand Up @@ -182,7 +185,7 @@ dependencies:
- libde265=1.0.15
- libdeflate=1.23
- libdrm=2.4.124
- libedit=3.1.20240808
- libedit=3.1.20250104
- libegl=1.7.0
- libev=4.33
- libevent=2.1.12
Expand All @@ -207,15 +210,13 @@ dependencies:
- libgoogle-cloud-storage=2.34.0
- libgrpc=1.67.1
- libheif=1.19.5
- libhwloc=2.11.2
- libiconv=1.17
- libjpeg-turbo=3.0.0
- libkml=1.3.0
- liblapack=3.9.0
- liblapacke=3.9.0
- libllvm19=19.1.7
- liblzma=5.6.3
- liblzma-devel=5.6.3
- liblzma=5.6.4
- libnetcdf=4.9.2
- libnghttp2=1.64.0
- libnsl=2.0.1
Expand All @@ -226,15 +227,13 @@ dependencies:
- libopentelemetry-cpp-headers=1.18.0
- libparquet=19.0.0
- libpciaccess=0.18
- libpng=1.6.45
- libpng=1.6.46
- libpq=17.2
- libprotobuf=5.28.3
- libre2-11=2024.07.02
- librsvg=2.58.4
- librttopo=1.1.0
- libscotch=7.0.4
- libspatialite=5.1.0
- libspral=2024.05.08
- libsqlite=3.48.0
- libssh2=1.11.1
- libstdcxx=14.2.0
Expand Down Expand Up @@ -263,13 +262,9 @@ dependencies:
- matplotlib-base=3.10.0
- matplotlib-inline=0.1.7
- memory_profiler=0.61.0
- metis=5.1.0
- minizip=4.0.7
- mpfr=4.2.1
- msgpack-python=1.1.0
- multiurl=0.3.3
- mumps-include=5.7.3
- mumps-seq=5.7.3
- munkres=1.1.4
- mysql-common=9.0.1
- mysql-libs=9.0.1
Expand Down Expand Up @@ -297,14 +292,14 @@ dependencies:
- pexpect=4.9.0
- pickleshare=0.7.5
- pillow=11.1.0
- pip=24.3.1
- pip=25.0
- pixman=0.44.2
- pkgutil-resolve-name=1.3.10
- plac=1.4.3
- platformdirs=4.3.6
- pluggy=1.5.0
- polars=1.20.0
- powerplantmatching=0.7.0
- polars=1.21.0
- powerplantmatching=0.7.1
- pre-commit=4.1.0
- progressbar2=4.5.0
- proj=9.5.1
Expand All @@ -325,7 +320,6 @@ dependencies:
- pyparsing=3.2.1
- pyproj=3.7.0
- pypsa=0.32.1
- pyscipopt=5.2.1
- pyshp=2.3.1
- pyside6=6.8.1
- pysocks=1.7.1
Expand All @@ -346,20 +340,19 @@ dependencies:
- rav1e=0.6.6
- re2=2024.07.02
- readline=8.2
- referencing=0.36.1
- referencing=0.36.2
- requests=2.32.3
- reretry=0.11.8
- rioxarray=0.18.2
- rpds-py=0.22.3
- ruff=0.9.2
- ruff=0.9.4
- s2n=1.5.11
- scikit-learn=1.6.1
- scip=9.1.1
- scipy=1.15.1
- seaborn=0.13.2
- seaborn-base=0.13.2
- setuptools=75.8.0
- shapely=2.0.6
- shapely=2.0.7
- six=1.17.0
- smart_open=7.1.0
- smmap=5.0.0
Expand All @@ -377,7 +370,6 @@ dependencies:
- 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
Expand All @@ -402,7 +394,7 @@ dependencies:
- wheel=0.45.1
- wrapt=1.17.2
- x265=3.5
- xarray=2025.1.1
- xarray=2025.1.2
- xcb-util=0.4.1
- xcb-util-cursor=0.1.5
- xcb-util-image=0.4.0
Expand All @@ -423,14 +415,12 @@ dependencies:
- xorg-libxext=1.3.6
- xorg-libxfixes=6.0.1
- xorg-libxi=1.8.2
- xorg-libxinerama=1.1.5
- xorg-libxrandr=1.5.4
- xorg-libxrender=0.9.12
- xorg-libxtst=1.2.5
- xorg-libxxf86vm=1.1.6
- xyzservices=2025.1.0
- xz=5.6.3
- xz-gpl-tools=5.6.3
- xz-tools=5.6.3
- yaml=0.2.5
- yte=1.5.6
- zict=3.0.0
Expand All @@ -440,11 +430,12 @@ dependencies:
- zstandard=0.23.0
- zstd=1.5.6
- pip:
- gurobipy==12.0.0
- gurobipy==12.0.1
- highspy==1.7.2
- oauthlib==3.2.2
- ply==3.11
- pyomo==6.8.2
- pyscipopt==5.2.1
- 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 e776e6e

Please sign in to comment.