Skip to content

Commit f6a37d5

Browse files
authored
⬆️Removed pip installation, replaced by UV repo-wide (#8007)
1 parent 4090c55 commit f6a37d5

File tree

30 files changed

+21
-188
lines changed

30 files changed

+21
-188
lines changed

ci/helpers/ensure_python_pip.bash

Lines changed: 0 additions & 26 deletions
This file was deleted.

packages/postgres-database/docker/Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ COPY --from=uv_build /uv /uvx /bin/
3232
# NOTE: python virtualenv is used here such that installed packages may be moved to production image easily by copying the venv
3333
RUN uv venv "${VIRTUAL_ENV}"
3434

35-
RUN --mount=type=cache,target=/root/.cache/uv \
36-
uv pip install --upgrade \
37-
wheel \
38-
setuptools
39-
4035
ARG GIT_BRANCH
4136
ARG GIT_REPOSITORY
4237

packages/postgres-database/scripts/erd/Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ RUN apt-get update \
2020
&& apt-get clean
2121

2222

23-
RUN --mount=type=cache,target=/root/.cache/uv \
24-
uv pip install --upgrade \
25-
wheel \
26-
setuptools
27-
2823

2924
# devenv
3025
COPY requirements.txt requirements.txt

packages/service-integration/Dockerfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,6 @@ COPY --from=uv_build /uv /uvx /bin/
7474
RUN uv venv "${VIRTUAL_ENV}"
7575

7676

77-
78-
RUN --mount=type=cache,target=/root/.cache/uv \
79-
uv pip install --upgrade \
80-
pip~=24.0 \
81-
wheel \
82-
setuptools
83-
8477
WORKDIR /build/packages/service-integration
8578

8679
RUN \

requirements/how-to-upgrade-python.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,7 @@ Both python and pip version are specified:
1717
ARG PYTHON_VERSION="3.9.12"
1818
FROM python:${PYTHON_VERSION}-slim-bookworm as base
1919
```
20-
- in the CI ``.github/workflows/ci-testing-deploy.yml``
21-
```yaml
22-
jobs:
23-
... :
24-
runs-on: ${{ matrix.os }}
25-
strategy:
26-
matrix:
27-
python: ["3.9"]
28-
```
29-
and in ``ci/helpers/ensure_python_pip.bash``
20+
- in ``.python-version``
3021

3122

3223

requirements/tools/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ COPY --from=uv_build /uv /uvx /bin/
3131

3232
RUN uv venv "${VIRTUAL_ENV}"
3333

34-
RUN --mount=type=cache,target=/root/.cache/uv \
35-
uv pip install --upgrade \
36-
wheel \
37-
setuptools
34+
3835

3936

4037

scripts/erd/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ RUN apt-get update \
2828
# install UV https://docs.astral.sh/uv/guides/integration/docker/#installing-uv
2929
COPY --from=uv_build /uv /uvx /bin/
3030

31-
RUN --mount=type=cache,target=/root/.cache/uv \
32-
uv pip install --upgrade \
33-
wheel \
34-
setuptools
3531

3632
COPY requirements.txt .
3733
RUN --mount=type=cache,target=/root/.cache/uv \

scripts/openapi/oas_resolver/Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ WORKDIR /src
1717
# install UV https://docs.astral.sh/uv/guides/integration/docker/#installing-uv
1818
COPY --from=uv_build /uv /uvx /bin/
1919

20-
# update pip
21-
RUN --mount=type=cache,target=/root/.cache/uv \
22-
uv pip install --upgrade \
23-
wheel \
24-
setuptools
2520

2621
RUN --mount=type=cache,target=/root/.cache/uv \
2722
uv pip install prance click openapi_spec_validator

scripts/pydeps-docker/Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ ARG HOME_DIR
3333
RUN mkdir -p ${HOME_DIR}
3434
COPY .pydeps ${HOME_DIR}/.pydeps
3535

36-
RUN --mount=type=cache,target=/root/.cache/uv \
37-
uv pip install --upgrade \
38-
wheel \
39-
setuptools
40-
4136

4237
# devenv
4338
RUN --mount=type=cache,target=/root/.cache/uv \

scripts/pyupgrade.bash

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@ Build() {
1919
--tag "$IMAGE_NAME" \
2020
- <<EOF
2121
FROM python:${PYTHON_VERSION}-slim-bookworm
22-
RUN pip --no-cache-dir install --upgrade \
23-
pip \
24-
wheel \
25-
setuptools
2622
27-
RUN pip install \
23+
RUN uv pip install \
2824
pyupgrade
2925
3026
ENTRYPOINT ["pyupgrade", \

0 commit comments

Comments
 (0)