Skip to content

Commit

Permalink
ci: Remove setuptools uprgrade as no longer backend (#2519)
Browse files Browse the repository at this point in the history
* Remove setuptools installs and upgrades from CI workflows and the
  Dockerfile build as it should not be required by any component of pyhf.
  • Loading branch information
matthewfeickert authored Jun 17, 2024
1 parent a0caf31 commit 644b1ba
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bump-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ jobs:
- name: Install Python dependencies
run: |
python -m pip install uv
uv pip install --system --upgrade pip setuptools wheel
uv pip install --system --upgrade pip wheel
uv pip install --system tbump
python -m pip list
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install uv
uv pip install --system --upgrade pip setuptools wheel
uv pip install --system --upgrade pip wheel
uv pip install --system --upgrade '.[all,test]'
- name: List installed Python packages
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ jobs:
if: matrix.python-version != '3.8'
run: |
python -m pip install uv
uv pip install --system --upgrade pip setuptools wheel
uv pip install --system --upgrade pip wheel
uv pip install --system --upgrade ".[all,test]"
# c.f. https://github.com/astral-sh/uv/issues/2062
- name: Install dependencies (Python 3.8)
if: matrix.python-version == '3.8'
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade pip wheel
python -m pip install --upgrade ".[all,test]"
- name: List installed Python packages
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/dependencies-head.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install uv
uv pip install --system --upgrade pip setuptools wheel
uv pip install --system --upgrade pip wheel
uv pip --no-cache --quiet install --system --upgrade --pre ".[all,test]"
python -m pip list
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install uv
uv pip install --system --upgrade pip setuptools wheel
uv pip install --system --upgrade pip wheel
uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
uv pip uninstall --system scipy
# uv wants to upgrade dependencies (numpy) to a dev release too, so don't --upgrade
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install uv
uv pip install --system --upgrade pip setuptools wheel
uv pip install --system --upgrade pip wheel
uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
uv pip uninstall --system iminuit
uv pip install --system --upgrade cython
Expand All @@ -119,7 +119,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install uv
uv pip install --system --upgrade pip setuptools wheel
uv pip install --system --upgrade pip wheel
uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
uv pip uninstall --system uproot
uv pip install --system --upgrade git+https://github.com/scikit-hep/uproot5.git
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install uv
uv pip install --system --upgrade pip setuptools wheel
uv pip install --system --upgrade pip wheel
uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
uv pip uninstall --system matplotlib
# Need to use --extra-index-url as all dependencies aren't on scientific-python-nightly-wheels package index.
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install uv
uv pip install --system --upgrade pip setuptools wheel
uv pip install --system --upgrade pip wheel
uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
uv pip uninstall --system pytest
uv pip install --system --upgrade git+https://github.com/pytest-dev/pytest.git
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Install Python dependencies
run: |
python -m pip install uv
uv pip install --system --upgrade pip setuptools wheel
uv pip install --system --upgrade pip wheel
uv pip --quiet install --system --upgrade ".[docs,test]"
uv pip install --system yq
python -m pip list
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install uv
uv pip install --system --upgrade pip setuptools wheel
uv pip install --system --upgrade pip wheel
# FIXME: c.f. https://github.com/scikit-hep/pyhf/issues/2104
uv pip install --system --upgrade ".[all,test]" 'jupyter-client<8.0.0'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Install from PyPI
run: |
python -m pip install uv
uv pip install --system --upgrade pip setuptools wheel
uv pip install --system --upgrade pip wheel
uv pip install --system --pre 'pyhf[backends,xmlio]'
uv pip install --system pytest
python -m pip list
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN apt-get -qq -y update && \
. /usr/local/venv/bin/activate && \
cd /code && \
python -m pip --no-cache-dir install --upgrade uv && \
uv pip install --no-cache --upgrade pip setuptools wheel && \
uv pip install --no-cache --upgrade pip wheel && \
uv pip install --no-cache '.[xmlio,contrib]' && \
uv pip list

Expand Down
2 changes: 1 addition & 1 deletion docker/gpu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ COPY . /code
COPY ./docker/gpu/install_backend.sh /code/install_backend.sh
WORKDIR /code
ARG BACKEND=tensorflow
RUN python3 -m pip --no-cache-dir install --upgrade pip setuptools wheel && \
RUN python3 -m pip --no-cache-dir install --upgrade pip wheel && \
/bin/bash install_backend.sh ${BACKEND} && \
python3 -m pip list

Expand Down

0 comments on commit 644b1ba

Please sign in to comment.