Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: Remove upgrade of wheel #2542

Merged
merged 2 commits into from
Sep 19, 2024
Merged

ci: Remove upgrade of wheel #2542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcb67cf
ci: Remove upgrade of wheel
matthewfeickert Sep 19, 2024
8a1a7ae
remove from Docker too
matthewfeickert Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/bump-version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ jobs:
- name: Install Python dependencies
run: |
python -m pip install uv
uv pip install --system --upgrade pip wheel
uv pip install --system tbump
python -m pip list

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ci-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ jobs:
- name: Install dependencies
run: |
python -m pip install uv
uv pip install --system --upgrade pip wheel
uv pip install --system --upgrade '.[all,test]'

- name: List installed Python packages
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,13 @@ jobs:
if: matrix.python-version != '3.8'
run: |
python -m pip install uv
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 wheel
python -m pip install --upgrade pip
python -m pip install --upgrade ".[all,test]"

- name: List installed Python packages
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/dependencies-head.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ jobs:
- name: Install dependencies
run: |
python -m pip install uv
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 +63,6 @@ jobs:
- name: Install dependencies
run: |
python -m pip install uv
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 +90,6 @@ jobs:
- name: Install dependencies
run: |
python -m pip install uv
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 +116,6 @@ jobs:
- name: Install dependencies
run: |
python -m pip install uv
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 +143,6 @@ jobs:
- name: Install dependencies
run: |
python -m pip install uv
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 +179,6 @@ jobs:
- name: Install dependencies
run: |
python -m pip install uv
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
1 change: 0 additions & 1 deletion .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
- name: Install Python dependencies
run: |
python -m pip install uv
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/lower-bound-requirements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Install dependencies and force lowest bound
run: |
python -m pip install uv
uv pip install --system --upgrade pip 'setuptools<70.0.0' wheel
uv pip install --system --upgrade 'setuptools<70.0.0'
uv pip --no-cache install --system --constraint tests/constraints.txt ".[all,test]"

- name: List installed Python packages
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/notebooks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
- name: Install dependencies
run: |
python -m pip install uv
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
1 change: 0 additions & 1 deletion .github/workflows/release_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
- name: Install from PyPI
run: |
python -m pip install uv
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
1 change: 0 additions & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG BASE_IMAGE=python:3.12-slim-bullseye
# hadolint ignore=DL3006
FROM ${BASE_IMAGE} as base

Check warning on line 3 in docker/Dockerfile

View workflow job for this annotation

GitHub Actions / Build, test, and publish Docker images to Docker Hub

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

FROM base as builder

Check warning on line 5 in docker/Dockerfile

View workflow job for this annotation

GitHub Actions / Build, test, and publish Docker images to Docker Hub

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
# Set PATH to pickup virtual environment by default
ENV PATH=/usr/local/venv/bin:"${PATH}"
COPY . /code
Expand All @@ -17,7 +17,6 @@
. /usr/local/venv/bin/activate && \
cd /code && \
python -m pip --no-cache-dir install --upgrade uv && \
uv pip install --no-cache --upgrade pip wheel && \
uv pip install --no-cache '.[xmlio,contrib]' && \
uv pip list

Expand Down Expand Up @@ -51,8 +50,8 @@

USER moby

ENV USER ${USER}

Check warning on line 53 in docker/Dockerfile

View workflow job for this annotation

GitHub Actions / Build, test, and publish Docker images to Docker Hub

Variables should be defined before their use 

UndefinedVar: Usage of undefined variable '$USER'
More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

Check warning on line 53 in docker/Dockerfile

View workflow job for this annotation

GitHub Actions / Build, test, and publish Docker images to Docker Hub

Legacy key/value format with whitespace separator should not be used 

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format
More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
ENV HOME /home/moby

Check warning on line 54 in docker/Dockerfile

View workflow job for this annotation

GitHub Actions / Build, test, and publish Docker images to Docker Hub

Legacy key/value format with whitespace separator should not be used 

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format
More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
WORKDIR ${HOME}/work

# Use C.UTF-8 locale to avoid issues with ASCII encoding
Expand Down