Skip to content

Commit

Permalink
bumping Pyomo version to 6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
bknueven committed Aug 23, 2021
1 parent 4d0d83d commit e3e546b
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
File renamed without changes.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Code base for Prescient production cost model / scenario generation / prediction

### Requirements
* Python 3.7 or later
* Pyomo 6.0 or later
* Pyomo 6.1 or later
* EGRET
* A mixed-integer linear programming (MILP) solver
* Open source: CBC, GLPK, SCIP, ...
Expand Down Expand Up @@ -68,7 +68,6 @@ Depending on your license, you may need to install a specific version of the sol
```
pip install xpress==8.8.6
```
Note for Xpress users: using the Python bindings for Xpress requires at least Pyomo 5.7.1.


### Testing Prescient
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ dependencies:
- numpy
- pandas
- python-dateutil
- pyomo>=6.0
- pyomo>=6.1
- scipy
- ipopt
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
]
},
package_data={'prescient.downloaders.rts_gmlc_prescient':['runners/*.txt','runners/templates/*']},
install_requires=['numpy','matplotlib','pandas','scipy','pyomo>=6.0',
install_requires=['numpy','matplotlib','pandas','scipy','pyomo>=6.1',
'python-dateutil','networkx','jupyter',
'gridx-egret @ git+https://github.com/grid-parity-exchange/Egret.git'],
dependency_links=['git+https://github.com/grid-parity-exchange/Egret.git#egg=gridx-egret'],
Expand Down

0 comments on commit e3e546b

Please sign in to comment.