Skip to content

Commit 14a5c16

Browse files
chore: Remove upgrade of wheel (#59)
* Remove install and upgrade of wheel. - For dependencies that don't provide a wheel, and don't have build-system metadata in pyproject.toml, modern setuptools has integrated wheel and so installation is unnecessary. c.f. pypa/setuptools#3859
1 parent 563ad4c commit 14a5c16

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

README.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ Options:
3232
The venv module '--system-site-packages' option is used by
3333
default. While it is not recommended, this behavior can be
3434
disabled through use of this flag.
35-
--no-update After venv creation don't update pip, setuptools, and wheel
36-
to the latest releases. Use of this option is not recommended,
35+
--no-update After venv creation don't update pip and setuptools to the
36+
latest releases. Use of this option is not recommended,
3737
but is faster.
3838
--no-uv After venv creation don't install uv and use it to update pip,
39-
setuptools, and wheel. By default, uv is installed.
39+
and setuptools. By default, uv is installed.
4040

4141
Note: cvmfs-venv extends the Python venv module and so requires Python 3.3+.
4242

@@ -100,7 +100,6 @@ Package Version
100100
pip 24.0
101101
setuptools 69.5.1
102102
uv 0.1.42
103-
wheel 0.43.0
104103
(lcg-example) [feickert@lxplus924 ~]$ python -m pip show hepdata-lib # Still have full LCG view
105104
Name: hepdata-lib
106105
Version: 0.12.0
@@ -145,7 +144,6 @@ pip 24.0
145144
setuptools 69.5.1
146145
typing_extensions 4.11.0
147146
uv 0.1.42
148-
wheel 0.43.0
149147
zipp 3.18.1
150148
(lcg-example) [feickert@lxplus924 ~]$ uv pip list # uv will show the same view
151149
Package Version
@@ -160,7 +158,6 @@ pip 24.0
160158
setuptools 69.5.1
161159
typing-extensions 4.11.0
162160
uv 0.1.42
163-
wheel 0.43.0
164161
zipp 3.18.1
165162
(lcg-example) [feickert@lxplus924 ~]$ deactivate # Resets PYTHONPATH given added hooks
166163
[feickert@lxplus924 ~]$ python -m pip show awkward # Get CVMFS's old version

cvmfs-venv.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ Options:
1414
The venv module '--system-site-packages' option is used by
1515
default. While it is not recommended, this behavior can be
1616
disabled through use of this flag.
17-
--no-update After venv creation don't update pip, setuptools, and wheel
18-
to the latest releases. Use of this option is not recommended,
17+
--no-update After venv creation don't update pip and setuptools to the
18+
latest releases. Use of this option is not recommended,
1919
but is faster.
2020
--no-uv After venv creation don't install uv and use it to update pip,
21-
setuptools, and wheel. By default, uv is installed.
21+
and setuptools. By default, uv is installed.
2222
2323
Note: cvmfs-venv extends the Python venv module and so requires Python 3.3+.
2424
@@ -438,14 +438,14 @@ if [ -z "${_no_uv}" ]; then
438438
python -m pip --quiet --no-cache-dir install --upgrade uv &> /dev/null
439439
fi
440440

441-
# Get latest pip, setuptools, wheel
441+
# Get latest pip and setuptools
442442
if [ -z "${_no_update}" ]; then
443443
# Use uv by default
444444
if [ -z "${_no_uv}" ]; then
445-
uv pip --quiet install --upgrade pip setuptools wheel
445+
uv pip --quiet install --upgrade pip setuptools
446446
else
447447
# Hide not-real errors from CVMFS by sending to /dev/null
448-
python -m pip --quiet --no-cache-dir install --upgrade pip setuptools wheel &> /dev/null
448+
python -m pip --quiet --no-cache-dir install --upgrade pip setuptools &> /dev/null
449449
fi
450450
fi
451451

0 commit comments

Comments
 (0)