Skip to content

Commit 1c2e4ef

Browse files
matthewfeickertmatthewfeickert
committed
Just give in and use 'uv pip' for everything
1 parent 8d46d23 commit 1c2e4ef

File tree

9 files changed

+42
-42
lines changed

9 files changed

+42
-42
lines changed

‎.github/workflows/bump-version.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@ jobs:
205205
- name: Install Python dependencies
206206
run: |
207207
python -m pip install uv
208-
python -m uv pip install --system --upgrade pip setuptools wheel
209-
python -m uv pip install --system tbump
208+
uv pip install --system --upgrade pip setuptools wheel
209+
uv pip install --system tbump
210210
python -m pip list
211211
212212
- name: Setup Git user to push new tag

‎.github/workflows/ci-windows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030
- name: Install dependencies
3131
run: |
3232
python -m pip install uv
33-
python -m uv pip install --system --upgrade pip setuptools wheel
34-
python -m uv pip install --system --upgrade '.[all,test]'
33+
uv pip install --system --upgrade pip setuptools wheel
34+
uv pip install --system --upgrade '.[all,test]'
3535
3636
- name: List installed Python packages
3737
run: python -m pip list

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ jobs:
4747
if: matrix.python-version != '3.8'
4848
run: |
4949
python -m pip install uv
50-
python -m uv pip install --system --upgrade pip setuptools wheel
51-
python -m uv pip install --system --upgrade ".[all,test]"
50+
uv pip install --system --upgrade pip setuptools wheel
51+
uv pip install --system --upgrade ".[all,test]"
5252
5353
# c.f. https://github.com/astral-sh/uv/issues/2062
5454
- name: Install dependencies (Python 3.8)

‎.github/workflows/dependencies-head.yml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030
- name: Install dependencies
3131
run: |
3232
python -m pip install uv
33-
python -m uv pip install --system --upgrade pip setuptools wheel
34-
python -m uv pip --no-cache --quiet install --system --upgrade --pre ".[all,test]"
33+
uv pip install --system --upgrade pip setuptools wheel
34+
uv pip --no-cache --quiet install --system --upgrade --pre ".[all,test]"
3535
python -m pip list
3636
3737
- name: List release candidates, alpha, and beta releases
@@ -63,10 +63,10 @@ jobs:
6363
- name: Install dependencies
6464
run: |
6565
python -m pip install uv
66-
python -m uv pip install --system --upgrade pip setuptools wheel
67-
python -m uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
68-
python -m uv pip uninstall --yes scipy
69-
python -m uv pip install --system --upgrade --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scipy
66+
uv pip install --system --upgrade pip setuptools wheel
67+
uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
68+
uv pip uninstall --yes scipy
69+
uv pip install --system --upgrade --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scipy
7070
python -m pip list
7171
7272
- name: Test with pytest
@@ -90,11 +90,11 @@ jobs:
9090
- name: Install dependencies
9191
run: |
9292
python -m pip install uv
93-
python -m uv pip install --system --upgrade pip setuptools wheel
94-
python -m uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
95-
python -m uv pip uninstall --yes iminuit
96-
python -m uv pip install --system --upgrade cython
97-
python -m uv pip install --system --upgrade git+https://github.com/scikit-hep/iminuit.git
93+
uv pip install --system --upgrade pip setuptools wheel
94+
uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
95+
uv pip uninstall --yes iminuit
96+
uv pip install --system --upgrade cython
97+
uv pip install --system --upgrade git+https://github.com/scikit-hep/iminuit.git
9898
python -m pip list
9999
- name: Test with pytest
100100
run: |
@@ -117,10 +117,10 @@ jobs:
117117
- name: Install dependencies
118118
run: |
119119
python -m pip install uv
120-
python -m uv pip install --system --upgrade pip setuptools wheel
121-
python -m uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
122-
python -m uv pip uninstall --yes uproot
123-
python -m uv pip install --system --upgrade git+https://github.com/scikit-hep/uproot5.git
120+
uv pip install --system --upgrade pip setuptools wheel
121+
uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
122+
uv pip uninstall --yes uproot
123+
uv pip install --system --upgrade git+https://github.com/scikit-hep/uproot5.git
124124
python -m pip list
125125
- name: Test with pytest
126126
run: |
@@ -145,12 +145,12 @@ jobs:
145145
- name: Install dependencies
146146
run: |
147147
python -m pip install uv
148-
python -m uv pip install --system --upgrade pip setuptools wheel
149-
python -m uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
150-
python -m uv pip uninstall --yes matplotlib
148+
uv pip install --system --upgrade pip setuptools wheel
149+
uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
150+
uv pip uninstall --yes matplotlib
151151
# Need to use --extra-index-url as dependencies aren't on scientific-python-nightly-wheels package index.
152152
# Need to use --pre as dev releases will need priority over stable releases.
153-
python -m uv pip install --system \
153+
uv pip install --system \
154154
--upgrade \
155155
--pre \
156156
--index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
@@ -181,10 +181,10 @@ jobs:
181181
- name: Install dependencies
182182
run: |
183183
python -m pip install uv
184-
python -m uv pip install --system --upgrade pip setuptools wheel
185-
python -m uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
186-
python -m uv pip uninstall --yes pytest
187-
python -m uv pip install --system --upgrade git+https://github.com/pytest-dev/pytest.git
184+
uv pip install --system --upgrade pip setuptools wheel
185+
uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
186+
uv pip uninstall --yes pytest
187+
uv pip install --system --upgrade git+https://github.com/pytest-dev/pytest.git
188188
python -m pip list
189189
- name: Test with pytest
190190
run: |

‎.github/workflows/docs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ jobs:
2929
- name: Install Python dependencies
3030
run: |
3131
python -m pip install uv
32-
python -m uv pip install --system --upgrade pip setuptools wheel
33-
python -m uv pip --quiet install --system --upgrade ".[docs,test]"
34-
python -m uv pip install --system yq
32+
uv pip install --system --upgrade pip setuptools wheel
33+
uv pip --quiet install --system --upgrade ".[docs,test]"
34+
uv pip install --system yq
3535
python -m pip list
3636
3737
- name: Install apt-get dependencies

‎.github/workflows/lower-bound-requirements.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
- name: Install dependencies and force lowest bound
2828
run: |
2929
python -m pip install uv
30-
python -m uv pip install --system --upgrade pip setuptools wheel
31-
python -m uv pip --no-cache install --system --constraint tests/constraints.txt ".[all,test]"
30+
uv pip install --system --upgrade pip setuptools wheel
31+
uv pip --no-cache install --system --constraint tests/constraints.txt ".[all,test]"
3232
3333
- name: List installed Python packages
3434
run: python -m pip list

‎.github/workflows/notebooks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ jobs:
2929
- name: Install dependencies
3030
run: |
3131
python -m pip install uv
32-
python -m uv pip install --system --upgrade pip setuptools wheel
32+
uv pip install --system --upgrade pip setuptools wheel
3333
# FIXME: c.f. https://github.com/scikit-hep/pyhf/issues/2104
34-
python -m uv pip install --system --upgrade ".[all,test]" 'jupyter-client<8.0.0'
34+
uv pip install --system --upgrade ".[all,test]" 'jupyter-client<8.0.0'
3535
3636
- name: List installed Python packages
3737
run: python -m pip list

‎.github/workflows/publish-package.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ jobs:
4444
- name: Install python-build and twine
4545
run: |
4646
python -m pip install uv
47-
python -m uv pip install --system --upgrade pip
48-
python -m uv pip install --system build twine
47+
uv pip install --system --upgrade pip
48+
uv pip install --system build twine
4949
python -m pip list
5050
5151
- name: Build a sdist and wheel

‎.github/workflows/release_tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ jobs:
3737
- name: Install from PyPI
3838
run: |
3939
python -m pip install uv
40-
python -m uv pip install --system --upgrade pip setuptools wheel
41-
python -m uv pip install --system --pre 'pyhf[backends,xmlio]'
42-
python -m uv pip install --system pytest
40+
uv pip install --system --upgrade pip setuptools wheel
41+
uv pip install --system --pre 'pyhf[backends,xmlio]'
42+
uv pip install --system pytest
4343
python -m pip list
4444
4545
- name: Canary test public API
@@ -49,6 +49,6 @@ jobs:
4949
# FIXME: c.f. https://github.com/proycon/codemetapy/issues/24
5050
- name: Verify requirements in codemeta.json
5151
run: |
52-
python -m uv pip install --system jq "codemetapy>=2.3.0"
52+
uv pip install --system jq "codemetapy>=2.3.0"
5353
codemetapy --inputtype python --no-extras pyhf > codemeta_generated.json
5454
diff <(jq -S .softwareRequirements codemeta.json) <(jq -S .softwareRequirements codemeta_generated.json)

0 commit comments

Comments
 (0)