Skip to content

Commit

Permalink
Pin setuptools to <72 for now.
Browse files Browse the repository at this point in the history
  • Loading branch information
rmjarvis committed Aug 7, 2024
1 parent 935539f commit c038fc8
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ jobs:
# Do these three first to clarify potential conflicts
pip install -U numpy
pip install -U setuptools
pip install -U "setuptools<72"
pip install -U wheel
# Standard dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install -U pip
pip install -U numpy setuptools
pip install -U numpy "setuptools<72"
pip install -U -r requirements.txt
- name: Download wheels
Expand Down
2 changes: 1 addition & 1 deletion conda_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The requirements packages that can be installed with
# conda install -y -c conda-forge --file conda_requirements.txt
setuptools>=38
setuptools>=38,<72
numpy>=1.17
astropy>=2.0
pybind11>=2.2
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = ["setuptools>=38", "wheel", "pybind11>=2.2"]
requires = ["setuptools>=38,<72", "wheel", "pybind11>=2.2"]
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# These are in conda_requirements.txt. If using that, you may prefer to do
# conda install -c conda-forge --file conda_requirements.txt
# prior to running pip install -r requirements.txt
setuptools>=38
setuptools>=38,<72
numpy>=1.17
astropy>=2.0
pybind11>=2.2
Expand Down
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -1228,6 +1228,9 @@ def run(self):
self.distribution.script_install_dir = self.install_dir

class my_test(test):
# TODO: setuptools v72 deprecated python setup.py test, so we need to figure out another
# way to test the C++ code. For now, we are pinning setuptools to <72.

# cf. https://pytest.readthedocs.io/en/2.7.3/goodpractises.html
user_options = [('njobs=', 'j', "Number of jobs to use in py.test")]

Expand Down Expand Up @@ -1340,7 +1343,7 @@ def run_tests(self):
undef_macros = undef_macros,
extra_link_args = ["-lfftw3"])

build_dep = ['setuptools>=38', 'pybind11>=2.2', 'numpy>=1.17']
build_dep = ['setuptools>=38,<72', 'pybind11>=2.2', 'numpy>=1.17']
run_dep = ['astropy', 'LSSTDESC.Coord']
test_dep = ['pytest', 'pytest-xdist', 'pytest-timeout', 'nose', 'scipy', 'pyyaml']
# Note: Even though we don't use nosetests, nose is required for some tests to work.
Expand Down

0 comments on commit c038fc8

Please sign in to comment.