From 1c2e4ef02cc2583e57fb757ada2c384d8ff895f7 Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Sat, 27 Apr 2024 13:28:02 -0500 Subject: [PATCH] Just give in and use 'uv pip' for everything --- .github/workflows/bump-version.yml | 4 +- .github/workflows/ci-windows.yml | 4 +- .github/workflows/ci.yml | 4 +- .github/workflows/dependencies-head.yml | 46 +++++++++---------- .github/workflows/docs.yml | 6 +-- .../workflows/lower-bound-requirements.yml | 4 +- .github/workflows/notebooks.yml | 4 +- .github/workflows/publish-package.yml | 4 +- .github/workflows/release_tests.yml | 8 ++-- 9 files changed, 42 insertions(+), 42 deletions(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 496f29d4a4..cfd178cac4 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -205,8 +205,8 @@ jobs: - name: Install Python dependencies run: | python -m pip install uv - python -m uv pip install --system --upgrade pip setuptools wheel - python -m uv pip install --system tbump + uv pip install --system --upgrade pip setuptools wheel + uv pip install --system tbump python -m pip list - name: Setup Git user to push new tag diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index 565c7b866c..696fadc5a4 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -30,8 +30,8 @@ jobs: - name: Install dependencies run: | python -m pip install uv - python -m uv pip install --system --upgrade pip setuptools wheel - python -m uv pip install --system --upgrade '.[all,test]' + uv pip install --system --upgrade pip setuptools wheel + uv pip install --system --upgrade '.[all,test]' - name: List installed Python packages run: python -m pip list diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a7319143b..82a92e10fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,8 +47,8 @@ jobs: if: matrix.python-version != '3.8' run: | python -m pip install uv - python -m uv pip install --system --upgrade pip setuptools wheel - python -m uv pip install --system --upgrade ".[all,test]" + uv pip install --system --upgrade pip setuptools wheel + uv pip install --system --upgrade ".[all,test]" # c.f. https://github.com/astral-sh/uv/issues/2062 - name: Install dependencies (Python 3.8) diff --git a/.github/workflows/dependencies-head.yml b/.github/workflows/dependencies-head.yml index 75c35a883c..c9945d7747 100644 --- a/.github/workflows/dependencies-head.yml +++ b/.github/workflows/dependencies-head.yml @@ -30,8 +30,8 @@ jobs: - name: Install dependencies run: | python -m pip install uv - python -m uv pip install --system --upgrade pip setuptools wheel - python -m uv pip --no-cache --quiet install --system --upgrade --pre ".[all,test]" + uv pip install --system --upgrade pip setuptools wheel + uv pip --no-cache --quiet install --system --upgrade --pre ".[all,test]" python -m pip list - name: List release candidates, alpha, and beta releases @@ -63,10 +63,10 @@ jobs: - name: Install dependencies run: | python -m pip install uv - python -m uv pip install --system --upgrade pip setuptools wheel - python -m uv pip --no-cache --quiet install --system --upgrade ".[all,test]" - python -m uv pip uninstall --yes scipy - python -m uv pip install --system --upgrade --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scipy + uv pip install --system --upgrade pip setuptools wheel + uv pip --no-cache --quiet install --system --upgrade ".[all,test]" + uv pip uninstall --yes scipy + uv pip install --system --upgrade --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scipy python -m pip list - name: Test with pytest @@ -90,11 +90,11 @@ jobs: - name: Install dependencies run: | python -m pip install uv - python -m uv pip install --system --upgrade pip setuptools wheel - python -m uv pip --no-cache --quiet install --system --upgrade ".[all,test]" - python -m uv pip uninstall --yes iminuit - python -m uv pip install --system --upgrade cython - python -m uv pip install --system --upgrade git+https://github.com/scikit-hep/iminuit.git + uv pip install --system --upgrade pip setuptools wheel + uv pip --no-cache --quiet install --system --upgrade ".[all,test]" + uv pip uninstall --yes iminuit + uv pip install --system --upgrade cython + uv pip install --system --upgrade git+https://github.com/scikit-hep/iminuit.git python -m pip list - name: Test with pytest run: | @@ -117,10 +117,10 @@ jobs: - name: Install dependencies run: | python -m pip install uv - python -m uv pip install --system --upgrade pip setuptools wheel - python -m uv pip --no-cache --quiet install --system --upgrade ".[all,test]" - python -m uv pip uninstall --yes uproot - python -m uv pip install --system --upgrade git+https://github.com/scikit-hep/uproot5.git + uv pip install --system --upgrade pip setuptools wheel + uv pip --no-cache --quiet install --system --upgrade ".[all,test]" + uv pip uninstall --yes uproot + uv pip install --system --upgrade git+https://github.com/scikit-hep/uproot5.git python -m pip list - name: Test with pytest run: | @@ -145,12 +145,12 @@ jobs: - name: Install dependencies run: | python -m pip install uv - python -m uv pip install --system --upgrade pip setuptools wheel - python -m uv pip --no-cache --quiet install --system --upgrade ".[all,test]" - python -m uv pip uninstall --yes matplotlib + uv pip install --system --upgrade pip setuptools wheel + uv pip --no-cache --quiet install --system --upgrade ".[all,test]" + uv pip uninstall --yes matplotlib # Need to use --extra-index-url as dependencies aren't on scientific-python-nightly-wheels package index. # Need to use --pre as dev releases will need priority over stable releases. - python -m uv pip install --system \ + uv pip install --system \ --upgrade \ --pre \ --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \ @@ -181,10 +181,10 @@ jobs: - name: Install dependencies run: | python -m pip install uv - python -m uv pip install --system --upgrade pip setuptools wheel - python -m uv pip --no-cache --quiet install --system --upgrade ".[all,test]" - python -m uv pip uninstall --yes pytest - python -m uv pip install --system --upgrade git+https://github.com/pytest-dev/pytest.git + uv pip install --system --upgrade pip setuptools wheel + uv pip --no-cache --quiet install --system --upgrade ".[all,test]" + uv pip uninstall --yes pytest + uv pip install --system --upgrade git+https://github.com/pytest-dev/pytest.git python -m pip list - name: Test with pytest run: | diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 91a3976601..0bb1bc4315 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -29,9 +29,9 @@ jobs: - name: Install Python dependencies run: | python -m pip install uv - python -m uv pip install --system --upgrade pip setuptools wheel - python -m uv pip --quiet install --system --upgrade ".[docs,test]" - python -m uv pip install --system yq + uv pip install --system --upgrade pip setuptools wheel + uv pip --quiet install --system --upgrade ".[docs,test]" + uv pip install --system yq python -m pip list - name: Install apt-get dependencies diff --git a/.github/workflows/lower-bound-requirements.yml b/.github/workflows/lower-bound-requirements.yml index fa304dc718..e9ebdbaa86 100644 --- a/.github/workflows/lower-bound-requirements.yml +++ b/.github/workflows/lower-bound-requirements.yml @@ -27,8 +27,8 @@ jobs: - name: Install dependencies and force lowest bound run: | python -m pip install uv - python -m uv pip install --system --upgrade pip setuptools wheel - python -m uv pip --no-cache install --system --constraint tests/constraints.txt ".[all,test]" + uv pip install --system --upgrade pip setuptools wheel + uv pip --no-cache install --system --constraint tests/constraints.txt ".[all,test]" - name: List installed Python packages run: python -m pip list diff --git a/.github/workflows/notebooks.yml b/.github/workflows/notebooks.yml index 58e821220d..8278f2abdc 100644 --- a/.github/workflows/notebooks.yml +++ b/.github/workflows/notebooks.yml @@ -29,9 +29,9 @@ jobs: - name: Install dependencies run: | python -m pip install uv - python -m uv pip install --system --upgrade pip setuptools wheel + uv pip install --system --upgrade pip setuptools wheel # FIXME: c.f. https://github.com/scikit-hep/pyhf/issues/2104 - python -m uv pip install --system --upgrade ".[all,test]" 'jupyter-client<8.0.0' + uv pip install --system --upgrade ".[all,test]" 'jupyter-client<8.0.0' - name: List installed Python packages run: python -m pip list diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml index 7b3093ebfb..0537d322cb 100644 --- a/.github/workflows/publish-package.yml +++ b/.github/workflows/publish-package.yml @@ -44,8 +44,8 @@ jobs: - name: Install python-build and twine run: | python -m pip install uv - python -m uv pip install --system --upgrade pip - python -m uv pip install --system build twine + uv pip install --system --upgrade pip + uv pip install --system build twine python -m pip list - name: Build a sdist and wheel diff --git a/.github/workflows/release_tests.yml b/.github/workflows/release_tests.yml index b81f6ec75b..2d3f2e8bd5 100644 --- a/.github/workflows/release_tests.yml +++ b/.github/workflows/release_tests.yml @@ -37,9 +37,9 @@ jobs: - name: Install from PyPI run: | python -m pip install uv - python -m uv pip install --system --upgrade pip setuptools wheel - python -m uv pip install --system --pre 'pyhf[backends,xmlio]' - python -m uv pip install --system pytest + uv pip install --system --upgrade pip setuptools wheel + uv pip install --system --pre 'pyhf[backends,xmlio]' + uv pip install --system pytest python -m pip list - name: Canary test public API @@ -49,6 +49,6 @@ jobs: # FIXME: c.f. https://github.com/proycon/codemetapy/issues/24 - name: Verify requirements in codemeta.json run: | - python -m uv pip install --system jq "codemetapy>=2.3.0" + uv pip install --system jq "codemetapy>=2.3.0" codemetapy --inputtype python --no-extras pyhf > codemeta_generated.json diff <(jq -S .softwareRequirements codemeta.json) <(jq -S .softwareRequirements codemeta_generated.json)