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.

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

Bump Python to 3.12 #514

Merged
merged 6 commits into from
Feb 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
key: poetry-dev-${{ hashFiles('poetry.lock') }}
- uses: actions/setup-python@v4
with:
python-version: "3.11"
python-version: "3.12"
- name: Install dependencies
run: make install
- name: Run linting and formatting checks
Expand All @@ -36,7 +36,7 @@ jobs:
run: pipx install poetry
- uses: actions/setup-python@v4
with:
python-version: "3.11"
python-version: "3.12"
- uses: actions/cache@v3
# We need to use this caching strategy (rather than setting `cache: poetry`` in setup-python)
# because our use of dependency groups. We want separate caches for each dependency group.
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
run: pipx install poetry
- uses: actions/setup-python@v4
with:
python-version: "3.11"
python-version: "3.12"
- uses: actions/cache@v3
# We need to use this caching strategy (rather than setting `cache: poetry`` in setup-python)
# because our use of dependency groups. We want separate caches for each dependency group.
Expand All @@ -99,9 +99,9 @@ jobs:
DOCKER_CACHE: /tmp/docker-cache
steps:
- uses: actions/checkout@v3

- run: mkdir ${DOCKER_CACHE}

- name: Compute cache key
# Create hash of hashes of checked in files not in Dockerignore
run: echo "CACHE_KEY=$(git ls-tree --full-tree -r HEAD | grep -v -f RemoteSettings.dockerignore | awk '{print $3}' | git hash-object --stdin)" >> $GITHUB_ENV
Expand All @@ -119,7 +119,7 @@ jobs:
uses: docker/setup-buildx-action@v3
with:
install: true

- name: Build web container
uses: docker/build-push-action@v5
with:
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
uses: docker/setup-buildx-action@v3
with:
install: true

- name: Build web container
uses: docker/build-push-action@v5
with:
Expand Down
4 changes: 2 additions & 2 deletions IntegrationTests.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11.5-slim as build
FROM python:3.12.1-slim as build

ENV PIP_NO_CACHE_DIR=off \
PIP_DISABLE_PIP_VERSION_CHECK=on \
Expand All @@ -17,7 +17,7 @@ WORKDIR /opt
COPY pyproject.toml poetry.lock ./
RUN $POETRY_HOME/bin/poetry install --only integration-tests --no-root

FROM python:3.11.5-slim
FROM python:3.12.1-slim
ENV PATH="/opt/.venv/bin:$PATH" \
PYTHONUNBUFFERED=1 \
VIRTUAL_ENV=/opt/.venv \
Expand Down
4 changes: 2 additions & 2 deletions RemoteSettings.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11.5 as compile
FROM python:3.12.1 as compile

ENV PIP_NO_CACHE_DIR=off \
PIP_DISABLE_PIP_VERSION_CHECK=on \
Expand Down Expand Up @@ -36,7 +36,7 @@ COPY kinto-admin/ kinto-admin/
RUN ./pull-kinto-admin.sh


FROM python:3.11.5-slim as production
FROM python:3.12.1-slim as production

ENV KINTO_INI=config/local.ini \
KINTO_ADMIN_ASSETS_PATH=/app/kinto-admin/build/ \
Expand Down
Loading
Loading