Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove setuptools version pin #8475

Merged
merged 1 commit into from Oct 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions buildscripts/condarecipe.local/meta.yaml
Expand Up @@ -31,7 +31,7 @@ requirements:
host:
- python
- numpy
- setuptools <60
- setuptools
- importlib_metadata # [py<39]
# On channel https://anaconda.org/numba/
- llvmlite >=0.40.0dev0,<0.40
Expand All @@ -45,7 +45,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
- setuptools <60
- setuptools
- importlib_metadata # [py<39]
# On channel https://anaconda.org/numba/
- llvmlite >=0.40.0dev0,<0.40
Expand Down Expand Up @@ -74,7 +74,7 @@ test:
- cffi
- scipy
- ipython # [not aarch64]
- setuptools <60
- setuptools
- tbb >=2021 # [not (aarch64 or ppc64le)]
- llvm-openmp # [osx]
# This is for driving gdb tests
Expand Down
2 changes: 1 addition & 1 deletion buildscripts/gpuci/build.sh
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion buildscripts/incremental/setup_conda_environment.cmd
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion buildscripts/incremental/setup_conda_environment.sh
Expand Up @@ -33,7 +33,7 @@ conda list
# Create a base env first and then add to it...
# NOTE: gitpython is needed for CI testing to do the test slicing
# NOTE: pyyaml is used to ensure that the Azure CI config is valid
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

# Activate first
set +v
Expand Down
2 changes: 1 addition & 1 deletion docs/environment.yml
Expand Up @@ -9,7 +9,7 @@ dependencies:
- llvmlite=0.40
- 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.
Expand Down
4 changes: 2 additions & 2 deletions docs/source/user/installing.rst
Expand Up @@ -174,14 +174,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``

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -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),
'setuptools <60',
'setuptools',
'importlib_metadata; python_version < "3.9"',
]

Expand Down