Skip to content

Commit

Permalink
Bump Python version in container to 3.11 (#525)
Browse files Browse the repository at this point in the history
* Bump Python version in container to 3.11

* Bump version of GHA checkout action.

* Pin cython<3 in container build.
  • Loading branch information
danielballan authored Jul 19, 2023
1 parent e3cfaa1 commit 4009414
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-validate-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Install Container Canary
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: "3.x"
Expand All @@ -32,7 +32,7 @@ jobs:
fail-fast: false
steps:

- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
fail-fast: false
steps:

- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:

- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
export REPOSITORY_NAME=${GITHUB_REPOSITORY#*/}
echo "REPOSITORY_NAME=${REPOSITORY_NAME}" >> $GITHUB_ENV
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 1000 # should be enough to reach the most recent tag

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN npm install && npm run build

# We cannot upgrade to Python 3.11 until numba supports it.
# The `sparse` library relies on numba.
FROM python:3.10-slim as builder
FROM python:3.11-slim as builder

# We need git at build time in order for versioneer to work, which in turn is
# needed for the server to correctly report the library_version in the /api/v1/
Expand All @@ -26,7 +26,7 @@ RUN python3 -m venv $VIRTUAL_ENV
# in ENTRYPOINT or CMD.
ENV PATH="$VIRTUAL_ENV/bin:$PATH"

RUN pip install --upgrade --no-cache-dir cython pip wheel
RUN pip install --upgrade --no-cache-dir "cython<3" pip wheel

COPY --from=web_frontend_builder /code/dist /code/share/tiled/ui
COPY . .
Expand All @@ -40,7 +40,7 @@ RUN TILED_BUILD_SKIP_UI=1 pip install '.[server]'
# RUN pip install '.[client,dev]'
# RUN pytest -v

FROM python:3.10-slim as runner
FROM python:3.11-slim as runner

ENV VIRTUAL_ENV=/opt/venv
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
Expand Down

0 comments on commit 4009414

Please sign in to comment.