Merge pull request numba#8475 from gmarkall/remove-setuptools-pin

Remove setuptools version pin Resolved conflicts in: buildscripts/condarecipe.local/meta.yaml buildscripts/incremental/setup_conda_environment.sh setup.py
stuartarchibald · Oct 12, 2022 · 560a63f · 560a63f
1 parent d6731f6
commit 560a63f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/buildscripts/condarecipe.local/meta.yaml b/buildscripts/condarecipe.local/meta.yaml
@@ -32,7 +32,7 @@ requirements:
   host:
     - python
     - numpy
-    - setuptools <60
+    - setuptools
     - importlib_metadata       # [py<39]
     # On channel https://anaconda.org/numba/
     - llvmlite 0.39.*
@@ -46,7 +46,7 @@ requirements:
     - python >=3.7
     # NumPy 1.22.0, 1.22.1, 1.22.2 are all broken for ufuncs, see #7756
     - numpy >=1.18, !=1.22.0, !=1.22.1, !=1.22.2, <1.24
-    - setuptools <60
+    - setuptools
     - importlib_metadata       # [py<39]
     # On channel https://anaconda.org/numba/
     - llvmlite 0.39.*
@@ -76,7 +76,7 @@ test:
     # temporarily disable scipy testing on ARM, need to build out more packages
     - scipy                    # [not (armv6l or armv7l)]
     - ipython                  # [not (armv6l or armv7l or aarch64)]
-    - setuptools <60
+    - setuptools
     - tbb  >=2021              # [not (armv6l or armv7l or aarch64 or linux32 or ppc64le)]
     - llvm-openmp              # [osx]
     # This is for driving gdb tests

diff --git a/buildscripts/gpuci/build.sh b/buildscripts/gpuci/build.sh
@@ -46,7 +46,7 @@ gpuci_mamba_retry create -n numba_ci -y \
                   "psutil" \
                   "gcc_linux-64=7" \
                   "gxx_linux-64=7" \
-                  "setuptools<60"
+                  "setuptools"
 
 conda activate numba_ci
 

diff --git a/buildscripts/incremental/setup_conda_environment.cmd b/buildscripts/incremental/setup_conda_environment.cmd
@@ -22,7 +22,7 @@ call deactivate
 @rem Display root environment (for debugging)
 conda list
 @rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite
-conda create -n %CONDA_ENV% -q -y python=%PYTHON% numpy=%NUMPY% cffi pip jinja2 ipython gitpython pyyaml "setuptools<60"
+conda create -n %CONDA_ENV% -q -y python=%PYTHON% numpy=%NUMPY% cffi pip jinja2 ipython gitpython pyyaml
 
 call activate %CONDA_ENV%
 @rem Scipy comes from conda-forge for NumPy 1.23

diff --git a/buildscripts/incremental/setup_conda_environment.sh b/buildscripts/incremental/setup_conda_environment.sh
@@ -43,7 +43,7 @@ conda list
 if [[ "$CONDA_SUBDIR" == "linux-32" || "$BITS32" == "yes" ]]; then
     conda create -n $CONDA_ENV -q -y ${EXTRA_CHANNELS} python=$PYTHON pip gitpython pyyaml
 else
-    conda create -n $CONDA_ENV -q -y ${EXTRA_CHANNELS} python=$PYTHON numpy=$NUMPY pip gitpython pyyaml "setuptools<60"
+    conda create -n $CONDA_ENV -q -y ${EXTRA_CHANNELS} python=$PYTHON numpy=$NUMPY pip gitpython pyyaml
 fi
 
 # Activate first

diff --git a/docs/environment.yml b/docs/environment.yml
@@ -9,7 +9,7 @@ dependencies:
   - llvmlite=0.39
   - numpy
   - numpydoc
-  - setuptools<60
+  - setuptools
   # https://stackoverflow.com/questions/67542699/readthedocs-sphinx-not-rendering-bullet-list-from-rst-fileA
   - docutils==0.16
   # The following is needed to fix RTD.

diff --git a/docs/source/user/installing.rst b/docs/source/user/installing.rst
@@ -194,14 +194,14 @@ vary with target operating system and hardware. The following lists them all
 
 * Required build time:
 
-  * ``setuptools<60``
+  * ``setuptools``
   * ``numpy``
   * ``llvmlite``
   * Compiler toolchain mentioned above
 
 * Required run time:
 
-  * ``setuptools<60``
+  * ``setuptools``
   * ``numpy``
   * ``llvmlite``
 

diff --git a/setup.py b/setup.py
@@ -375,7 +375,7 @@ def check_file_at_path(path2file):
 install_requires = [
     'llvmlite >={},<{}'.format(min_llvmlite_version, max_llvmlite_version),
     'numpy >={},<{}'.format(min_numpy_run_version, max_numpy_run_version),
-    'setuptools<60',
+    'setuptools',
     'importlib_metadata; python_version < "3.9"',
 ]