Skip to content

Commit

Permalink
We can't use version 2 of numpy until there is an new pyomo relea…
Browse files Browse the repository at this point in the history
…se -- see Pyomo/pyomo#3292
  • Loading branch information
dbrnz committed Aug 6, 2024
1 parent 49a7d46 commit 465ae08
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 49 deletions.
2 changes: 1 addition & 1 deletion envs/mapmaker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ channels:
dependencies:
- python>=3.12,<4.0
- python-pptx>=0.6.21,<0.7.0
- conda-forge::numpy>=2.0.1
- conda-forge::numpy>=1.24,<2.0
- beziers>=0.4.0,<0.6.0
- requests>=2.31.0,<3.0.0
- pyparsing>=3.0.9,<4.0.0
Expand Down
85 changes: 38 additions & 47 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ include = ["mapmaker/output/data_mapping.json", "resources/*"]
[tool.poetry.dependencies]
python = ">=3.12,<4.0"
python-pptx = "^0.6.21"
numpy = "^2.0.1"
numpy = ">=1.24,<2.0"
beziers = "^0.5.0"
requests = "^2.32.0"
pyparsing = "^3.0.9"
Expand Down

0 comments on commit 465ae08

Please sign in to comment.