Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/#342 bug pyomo update #410

Merged
merged 5 commits into from
Jul 16, 2024
+5 −1,498
Merged

Fix/#342 bug pyomo update #410

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f2430a
delete unused curtailment.py
joda9 Jul 16, 2024
e18809a
delete unused storage_positioning.py
joda9 Jul 16, 2024
9bcd6d0
Update pypsa to 0.26.2 and delete pyomo dependencies
joda9 Jul 16, 2024
743b4cb
delete unused files
joda9 Jul 16, 2024
d1a712c
update demandlib version
joda9 Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update pypsa to 0.26.2 and delete pyomo dependencies
@joda9
joda9 committed Jul 16, 2024
commit 9bcd6d0c33ad5e2d47b3bd171ddbb53113f0fc91
2 changes: 1 addition & 1 deletion eDisGo_env.yml
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,6 @@ dependencies:
- conda-forge::pygeos
- conda-forge::contextily
- conda-forge::descartes
- conda-forge::pypsa >= 0.17.0, <= 0.20.1
- conda-forge::pypsa == 0.26.2
- pip:
- eDisGo
2 changes: 1 addition & 1 deletion eDisGo_env_dev.yml
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,6 @@ dependencies:
- conda-forge::pygeos
- conda-forge::contextily
- conda-forge::descartes
- conda-forge::pypsa >= 0.17.0, <= 0.20.1
- conda-forge::pypsa == 0.26.2
- pip:
- -e .[dev]
3 changes: 1 addition & 2 deletions rtd_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -8,10 +8,9 @@ multiprocess
networkx >= 2.5.0
pandas >= 1.4.0
plotly
pyomo >= 6.0
pypower
pyproj >= 3.0.0
pypsa >=0.17.0, <=0.20.1
pypsa == 0.26.2
pyyaml
saio
scikit-learn
3 changes: 1 addition & 2 deletions setup.py
View file
Original file line number Diff line number Diff line change
@@ -50,10 +50,9 @@ def read(fname):
"plotly",
"pydot",
"pygeos",
"pyomo <= 6.4.2", # Problem with PyPSA 20.1 fixed in newest PyPSA release
"pypower",
"pyproj >= 3.0.0",
"pypsa >= 0.17.0, <= 0.20.1",
"pypsa == 0.26.2",
"pyyaml",
"saio",
"scikit-learn <= 1.1.1",