Skip to content

Commit cade319

Browse files
ax3lax3l
authored
Python: setuptools[core] (#5736)
The pip instructions for setuptools require now to specify the `[core]` argument, otherwise dependent packages are used from the system and are usually outdated, which causes errors. X-ref: - https://setuptools.pypa.io/en/latest/userguide/quickstart.html - pypa/setuptools#4483 (comment)
1 parent cd2644d commit cade319

28 files changed

+32
-32
lines changed

Diff for: ‎.azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
python3 -m pip install --upgrade pip
8181
python3 -m pip install --upgrade build
8282
python3 -m pip install --upgrade packaging
83-
python3 -m pip install --upgrade setuptools
83+
python3 -m pip install --upgrade setuptools[core]
8484
python3 -m pip install --upgrade wheel
8585
python3 -m pip install --upgrade virtualenv
8686
python3 -m pip install --upgrade pipx

Diff for: ‎.github/workflows/cuda.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
cmake --build build_sp -j 4
8989
9090
python3 -m pip install --upgrade pip
91-
python3 -m pip install --upgrade build packaging setuptools wheel
91+
python3 -m pip install --upgrade build packaging setuptools[core] wheel
9292
export WARPX_MPI=ON
9393
export PYWARPX_LIB_DIR=$PWD/build_sp/lib/site-packages/pywarpx/
9494
python3 -m pip wheel .
@@ -191,7 +191,7 @@ jobs:
191191
#export CFLAGS="-noswitcherror"
192192
193193
#python3 -m pip install --upgrade pip
194-
#python3 -m pip install --upgrade build packaging setuptools wheel
194+
#python3 -m pip install --upgrade build packaging setuptools[core] wheel
195195
#export WARPX_MPI=ON
196196
#export PYWARPX_LIB_DIR=$PWD/build/lib/site-packages/pywarpx/
197197
#python3 -m pip wheel .

Diff for: ‎.github/workflows/intel.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
export CC=$(which icc)
5151
5252
python3 -m pip install --upgrade pip
53-
python3 -m pip install --upgrade build packaging setuptools wheel
53+
python3 -m pip install --upgrade build packaging setuptools[core] wheel
5454
5555
cmake -S . -B build_dp \
5656
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -118,7 +118,7 @@ jobs:
118118
export CC=$(which icx)
119119
120120
python3 -m pip install --upgrade pip
121-
python3 -m pip install --upgrade build packaging setuptools wheel
121+
python3 -m pip install --upgrade build packaging setuptools[core] wheel
122122
123123
cmake -S . -B build_sp \
124124
-DCMAKE_CXX_FLAGS_RELEASE="-O1 -DNDEBUG" \
@@ -201,6 +201,6 @@ jobs:
201201
202202
# Skip this as it will copy the binary artifacts and we are tight on disk space
203203
# python3 -m pip install --upgrade pip
204-
# python3 -m pip install --upgrade build packaging setuptools wheel
204+
# python3 -m pip install --upgrade build packaging setuptools[core] wheel
205205
# PYWARPX_LIB_DIR=$PWD/build_sp/lib/site-packages/pywarpx/ python3 -m pip wheel .
206206
# python3 -m pip install *.whl

Diff for: ‎.github/workflows/macos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: install pip dependencies
4848
run: |
4949
python3 -m pip install --upgrade pip
50-
python3 -m pip install --upgrade build packaging setuptools wheel
50+
python3 -m pip install --upgrade build packaging setuptools[core] wheel
5151
python3 -m pip install --upgrade mpi4py
5252
python3 -m pip install --upgrade -r Regression/requirements.txt
5353
- name: CCache Cache

Diff for: ‎.github/workflows/ubuntu.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ jobs:
211211
ccache -z
212212
213213
python3 -m pip install --upgrade pip
214-
python3 -m pip install --upgrade build packaging setuptools wheel
214+
python3 -m pip install --upgrade build packaging setuptools[core] wheel
215215
216216
export CXXFLAGS="-Werror -Wno-error=pass-failed"
217217

Diff for: ‎.github/workflows/windows.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
5353
python3 -m pip install --upgrade pip
5454
if(!$?) { Exit $LASTEXITCODE }
55-
python3 -m pip install --upgrade build packaging setuptools wheel
55+
python3 -m pip install --upgrade build packaging setuptools[core] wheel
5656
if(!$?) { Exit $LASTEXITCODE }
5757
cmake --build build --config Debug --target install
5858
if(!$?) { Exit $LASTEXITCODE }
@@ -113,7 +113,7 @@ jobs:
113113
114114
python3 -m pip install --upgrade pip
115115
if errorlevel 1 exit 1
116-
python3 -m pip install --upgrade build packaging setuptools wheel
116+
python3 -m pip install --upgrade build packaging setuptools[core] wheel
117117
if errorlevel 1 exit 1
118118
python3 -m pip install --upgrade -r requirements.txt
119119
if errorlevel 1 exit 1

Diff for: ‎Docs/source/install/cmake.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ PICMI Python Bindings
222222
.. code-block:: bash
223223
224224
python3 -m pip install -U pip
225-
python3 -m pip install -U build packaging setuptools wheel
225+
python3 -m pip install -U build packaging setuptools[core] wheel
226226
python3 -m pip install -U cmake
227227
python3 -m pip install -r requirements.txt
228228

Diff for: ‎Docs/source/install/hpc/lawrencium.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Optionally, download and install Python packages for :ref:`PICMI <usage-picmi>`
8383
python3 -m pip install --upgrade build
8484
python3 -m pip install --upgrade packaging
8585
python3 -m pip install --upgrade wheel
86-
python3 -m pip install --upgrade setuptools
86+
python3 -m pip install --upgrade setuptools[core]
8787
python3 -m pip install --upgrade cython
8888
python3 -m pip install --upgrade numpy
8989
python3 -m pip install --upgrade pandas

Diff for: ‎Docs/source/install/hpc/lxplus.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Now, ensure Python tooling is up-to-date:
148148
.. code-block:: bash
149149
150150
python3 -m pip install -U pip
151-
python3 -m pip install -U build packaging setuptools wheel
151+
python3 -m pip install -U build packaging setuptools[core] wheel
152152
python3 -m pip install -U cmake
153153
154154
Then we compile WarpX as in the previous section (with or without CUDA) adding ``-DWarpX_PYTHON=ON`` and then we install it into our Python:

Diff for: ‎Docs/source/install/users.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Given that you have the :ref:`WarpX dependencies <install-dependencies>` install
109109
.. code-block:: bash
110110
111111
python3 -m pip install -U pip
112-
python3 -m pip install -U build packaging setuptools wheel
112+
python3 -m pip install -U build packaging setuptools[core] wheel
113113
python3 -m pip install -U cmake
114114
115115
python3 -m pip wheel -v git+https://github.com/ECP-WarpX/WarpX.git

Diff for: ‎Tools/machines/adastra-cines/install_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ python3 -m pip install --upgrade pip
104104
python3 -m pip install --upgrade build
105105
python3 -m pip install --upgrade packaging
106106
python3 -m pip install --upgrade wheel
107-
python3 -m pip install --upgrade setuptools
107+
python3 -m pip install --upgrade setuptools[core]
108108
python3 -m pip install --upgrade cython
109109
python3 -m pip install --upgrade numpy
110110
python3 -m pip install --upgrade pandas

Diff for: ‎Tools/machines/crusher-olcf/install_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ python3 -m pip install --upgrade pip
8787
python3 -m pip install --upgrade build
8888
python3 -m pip install --upgrade packaging
8989
python3 -m pip install --upgrade wheel
90-
python3 -m pip install --upgrade setuptools
90+
python3 -m pip install --upgrade setuptools[core]
9191
python3 -m pip install --upgrade cython
9292
python3 -m pip install --upgrade numpy
9393
python3 -m pip install --upgrade pandas

Diff for: ‎Tools/machines/dane-llnl/install_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ python3 -m pip install --upgrade pip
100100
python3 -m pip install --upgrade build
101101
python3 -m pip install --upgrade packaging
102102
python3 -m pip install --upgrade wheel
103-
python3 -m pip install --upgrade setuptools
103+
python3 -m pip install --upgrade setuptools[core]
104104
python3 -m pip install --upgrade cython
105105
python3 -m pip install --upgrade numpy
106106
python3 -m pip install --upgrade pandas

Diff for: ‎Tools/machines/frontier-olcf/install_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ python3 -m pip install --upgrade pip
8686
python3 -m pip install --upgrade build
8787
python3 -m pip install --upgrade packaging
8888
python3 -m pip install --upgrade wheel
89-
python3 -m pip install --upgrade setuptools
89+
python3 -m pip install --upgrade setuptools[core]
9090
python3 -m pip install --upgrade "cython>=3.0"
9191
# cupy for ROCm
9292
# https://docs.cupy.dev/en/stable/install.html#building-cupy-for-rocm-from-source

Diff for: ‎Tools/machines/greatlakes-umich/install_v100_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ python3 -m pip install --upgrade pip
118118
python3 -m pip install --upgrade build
119119
python3 -m pip install --upgrade packaging
120120
python3 -m pip install --upgrade wheel
121-
python3 -m pip install --upgrade setuptools
121+
python3 -m pip install --upgrade setuptools[core]
122122
python3 -m pip install --upgrade cython
123123
python3 -m pip install --upgrade numpy
124124
python3 -m pip install --upgrade pandas

Diff for: ‎Tools/machines/hpc3-uci/install_gpu_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ python3 -m pip install --upgrade pip
117117
python3 -m pip install --upgrade build
118118
python3 -m pip install --upgrade packaging
119119
python3 -m pip install --upgrade wheel
120-
python3 -m pip install --upgrade setuptools
120+
python3 -m pip install --upgrade setuptools[core]
121121
python3 -m pip install --upgrade pipx
122122
python3 -m pip install --upgrade cython
123123
python3 -m pip install --upgrade numpy

Diff for: ‎Tools/machines/lassen-llnl/install_v100_dependencies_toss3.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ python3 -m pip install --upgrade pip
118118
python3 -m pip install --upgrade build
119119
python3 -m pip install --upgrade packaging
120120
python3 -m pip install --upgrade wheel
121-
python3 -m pip install --upgrade setuptools
121+
python3 -m pip install --upgrade setuptools[core]
122122
python3 -m pip install --upgrade cython
123123
python3 -m pip install --upgrade numpy
124124
python3 -m pip install --upgrade pandas

Diff for: ‎Tools/machines/leonardo-cineca/install_gpu_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ python3 -m pip install --upgrade pip
8585
python3 -m pip install --upgrade build
8686
python3 -m pip install --upgrade packaging
8787
python3 -m pip install --upgrade wheel
88-
python3 -m pip install --upgrade setuptools
88+
python3 -m pip install --upgrade setuptools[core]
8989
python3 -m pip install --upgrade cython
9090
python3 -m pip install --upgrade numpy
9191
python3 -m pip install --upgrade pandas

Diff for: ‎Tools/machines/lonestar6-tacc/install_a100_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ python3 -m pip install --upgrade pip
108108
python3 -m pip install --upgrade build
109109
python3 -m pip install --upgrade packaging
110110
python3 -m pip install --upgrade wheel
111-
python3 -m pip install --upgrade setuptools
111+
python3 -m pip install --upgrade setuptools[core]
112112
python3 -m pip install --upgrade cython
113113
python3 -m pip install --upgrade numpy
114114
python3 -m pip install --upgrade pandas

Diff for: ‎Tools/machines/lumi-csc/install_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ python3 -m pip install --upgrade pip
154154
python3 -m pip install --upgrade build
155155
python3 -m pip install --upgrade packaging
156156
python3 -m pip install --upgrade wheel
157-
python3 -m pip install --upgrade setuptools
157+
python3 -m pip install --upgrade setuptools[core]
158158
python3 -m pip install --upgrade cython
159159
python3 -m pip install --upgrade numpy
160160
python3 -m pip install --upgrade pandas

Diff for: ‎Tools/machines/perlmutter-nersc/Containerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ RUN python3 -m venv /opt/venv && \
155155
cython \
156156
packaging \
157157
build \
158-
setuptools
158+
setuptools[core]
159159

160160
# Set up the environment for the virtual environment
161161
ENV PATH="/opt/venv/bin:${PATH}"

Diff for: ‎Tools/machines/perlmutter-nersc/install_cpu_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ python3 -m pip install --upgrade pip
139139
python3 -m pip install --upgrade build
140140
python3 -m pip install --upgrade packaging
141141
python3 -m pip install --upgrade wheel
142-
python3 -m pip install --upgrade setuptools
142+
python3 -m pip install --upgrade setuptools[core]
143143
python3 -m pip install --upgrade cython
144144
python3 -m pip install --upgrade numpy
145145
python3 -m pip install --upgrade pandas

Diff for: ‎Tools/machines/perlmutter-nersc/install_gpu_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ python3 -m pip install --upgrade pip
139139
python3 -m pip install --upgrade build
140140
python3 -m pip install --upgrade packaging
141141
python3 -m pip install --upgrade wheel
142-
python3 -m pip install --upgrade setuptools
142+
python3 -m pip install --upgrade setuptools[core]
143143
python3 -m pip install --upgrade cython
144144
python3 -m pip install --upgrade numpy
145145
python3 -m pip install --upgrade pandas

Diff for: ‎Tools/machines/pitzer-osc/install_cpu_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ python3 -m pip cache purge
139139
python3 -m pip install --upgrade build
140140
python3 -m pip install --upgrade packaging
141141
python3 -m pip install --upgrade wheel
142-
python3 -m pip install --upgrade setuptools
142+
python3 -m pip install --upgrade setuptools[core]
143143
python3 -m pip install --upgrade cython
144144
python3 -m pip install --upgrade numpy
145145
python3 -m pip install --upgrade pandas

Diff for: ‎Tools/machines/pitzer-osc/install_v100_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ python3 -m pip cache purge
139139
python3 -m pip install --upgrade build
140140
python3 -m pip install --upgrade packaging
141141
python3 -m pip install --upgrade wheel
142-
python3 -m pip install --upgrade setuptools
142+
python3 -m pip install --upgrade setuptools[core]
143143
python3 -m pip install --upgrade cython
144144
python3 -m pip install --upgrade numpy
145145
python3 -m pip install --upgrade pandas

Diff for: ‎Tools/machines/polaris-alcf/install_gpu_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ python3 -m pip install --upgrade pip
102102
python3 -m pip install --upgrade build
103103
python3 -m pip install --upgrade packaging
104104
python3 -m pip install --upgrade wheel
105-
python3 -m pip install --upgrade setuptools
105+
python3 -m pip install --upgrade setuptools[core]
106106
python3 -m pip install --upgrade cython
107107
python3 -m pip install --upgrade numpy
108108
python3 -m pip install --upgrade pandas

Diff for: ‎Tools/machines/summit-olcf/install_gpu_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ python3 -m pip install --upgrade pip
100100
python3 -m pip install --upgrade build
101101
python3 -m pip install --upgrade packaging
102102
python3 -m pip install --upgrade wheel
103-
python3 -m pip install --upgrade setuptools
103+
python3 -m pip install --upgrade setuptools[core]
104104
python3 -m pip install --upgrade cython
105105
python3 -m pip install --upgrade numpy
106106
python3 -m pip install --upgrade pandas

Diff for: ‎Tools/machines/tioga-llnl/install_mi300a_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ python3 -m pip install --upgrade pip
158158
python3 -m pip install --upgrade build
159159
python3 -m pip install --upgrade packaging
160160
python3 -m pip install --upgrade wheel
161-
python3 -m pip install --upgrade setuptools
161+
python3 -m pip install --upgrade setuptools[core]
162162
python3 -m pip install --upgrade cython
163163
python3 -m pip install --upgrade numpy
164164
python3 -m pip install --upgrade pandas

0 commit comments

Comments
 (0)