Skip to content

Commit

Permalink
Merge pull request #177 from OSeMOSYS/issue-166
Browse files Browse the repository at this point in the history
Upgrages otoole to version `1.1`
  • Loading branch information
trevorb1 authored May 1, 2024
2 parents 5572d2e + 34c1f34 commit bb786a3
Show file tree
Hide file tree
Showing 15 changed files with 202 additions and 384 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
matrix:
# os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest]
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11"]

steps:

Expand Down
2 changes: 2 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
- Emission limits
- Fuel limits
- Renewable energy targets
- Bumps pandas to version 2.0
- Bumps otoole to version 1.1

## Version 1.0.0
- Adds custom node functionality
Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pytest
world-bank-data
scikit-learn
myst-parser
otoole>=1.0.0, <1.1.0
otoole>=1.1.0
scipy
dash
geos
Expand Down
106 changes: 0 additions & 106 deletions resources/cplex_transform.py

This file was deleted.

Loading

0 comments on commit bb786a3

Please sign in to comment.