Skip to content

Commit

Permalink
Fixed so that version requirements are in agreement also in python (#…
Browse files Browse the repository at this point in the history
…1088)


## Type of change
- [x] Bug fix & code cleanup
- [ ] New feature
- [ ] Documentation update
- [ ] Test update
  • Loading branch information
francescalb authored Jan 27, 2025
2 parents 92bf1f6 + 6c46b95 commit 7129867
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ jobs:
- name: Install Python dependencies
run: |
python -m pip install -U pip
pip install -U setuptools wheel build
pip install -U build
# Build requirements
pip install -U -r requirements.txt -r requirements_dev.txt
Expand Down
12 changes: 5 additions & 7 deletions python/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[build-system]
requires = [
"numpy>=1.14.5,<2.1.3",
"swig==4.3.0",
"cmake==3.31.1",
#"setuptools==57.5.0; python_version<'3.9'",
#"setuptools==75.3.0; python_version>='3.9'",
"setuptools==75.3.0",
"wheel==0.41.3",
"numpy>=1.14.5,<2.1.3", # must agree with ../requirements.txt
"swig==4.3.0", # must agree with ../requirements_dev.txt
"cmake==3.31.4", # must agree with ../requirements_dev.txt
"setuptools==75.3.0", # must agree with ../requirements_dev.txt
"wheel==0.45.1", # must agree with ../requirements_dev.txt
]
build-backend = "setuptools.build_meta"

Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
numpy>=1.14.5,<2.1.3
numpy>=1.14.5,<2.1.3 # Must agree with python/pyproject.toml

8 changes: 4 additions & 4 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Requirements building
swig==4.3.0
cmake==3.31.4
wheel==0.45.1
swig==4.3.0 # Must agree with python/pyproject.toml
cmake==3.31.4 # Must agree with python/pyproject.toml
wheel==0.45.1 # Must agree with python/pyproject.toml

# Note, the setuptools==75.3.0 is the highest supported version in the Windows wheel
setuptools==75.3.0
setuptools==75.3.0 # Must agree with python/pyproject.toml

0 comments on commit 7129867

Please sign in to comment.