Merge branch 'master' into fix/deprecation-warning-pandas-1.4
This commit is contained in:
commit
4a106aae65
@ -32,7 +32,7 @@ dependencies:
|
||||
- netcdf4
|
||||
- networkx
|
||||
- scipy
|
||||
- shapely<2.0
|
||||
- shapely>=2.0
|
||||
- progressbar2
|
||||
- pyomo
|
||||
- matplotlib<3.6
|
||||
|
Loading…
Reference in New Issue
Block a user