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.

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

Replacing __getitem__() with at() for ordered sets #243

Merged
merged 6 commits into from
Aug 23, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
bumping minimum Pyomo version to 6.1.1
  • Loading branch information
bknueven committed Aug 18, 2021
commit cbccf30fa73459e4b4887585edff55b0d5726951
13 changes: 3 additions & 10 deletions .github/workflows/egret.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,17 @@ jobs:
matrix:
os: [ubuntu-latest]
python-version: [3.7, 3.8, 3.9]
pyomo-version: [5.7.1]
pyutilib-version: [6.0.0]
pyomo-version: [6.1.1]
include:
- os: macos-latest
python-version: 3.7
pyomo-version: 5.7.1
pyutilib-version: 6.0.0
pyomo-version: 6.1.1
- os: windows-latest
python-version: 3.7
pyomo-version: 5.7.1
pyutilib-version: 6.0.0
pyomo-version: 6.1.1
- os: ubuntu-latest
python-version: 3.7
pyomo-version: main
pyutilib-version: master
steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
Expand Down Expand Up @@ -111,9 +107,6 @@ jobs:
- name: Install Cython/Numpy/Pandas
run: |
pip install cython numpy pandas
- name: Instal Pyutilib
run: |
pip install git+https://github.com/PyUtilib/pyutilib.git@${{ matrix.pyutilib-version }}
- name: Install Pyomo
run: |
pip install git+https://github.com/Pyomo/pyomo.git@${{ matrix.pyomo-version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prescient.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
matrix:
os: [ubuntu-latest]
python-version: [3.7]
pyomo-version: [5.7.1]
pyomo-version: [6.1.1]
steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ EGRET is available under the BSD License (see [LICENSE.txt](https://github.com/g
### Requirements

* Python 3.7 or later
* Pyomo version 5.7.1 or later
* Pyomo version 6.1.1 or later
* pytest
* Optimization solvers for Pyomo - specific requirements depends on the models being solved. EGRET is tested with Gurobi or CPLEX for MIP-based problems (e.g., unit commitment) and Ipopt (with HSL linear solvers) for NLP problems.

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'zip_safe': False,
'scripts': [],
'include_package_data': True,
'install_requires': ['pyomo>=5.7.1', 'numpy', 'pytest', 'pandas',
'install_requires': ['pyomo>=6.1.1', 'numpy', 'pytest', 'pandas',
'matplotlib', 'seaborn', 'scipy', 'networkx',
'coramin==0.1.0'],
'python_requires' : '>=3.7, <4',
Expand Down