Merge branch 'master' into fix/deprecation-warning-pandas-1.4

This commit is contained in:
Fabian Neumann 2023-02-11 09:34:49 +01:00 committed by GitHub
commit 4a106aae65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -32,7 +32,7 @@ dependencies:
- netcdf4
- networkx
- scipy
- shapely<2.0
- shapely>=2.0
- progressbar2
- pyomo
- matplotlib<3.6