Skip to content

Commit

Permalink
chore(python): upgrade as high as it works (#854)
Browse files Browse the repository at this point in the history
* chore(python): upgrade as high as it works

There are some limitations. Docs have an open issue dask/dask-sphinx-theme#68 which locks us on python 3.11.

Chartpress (https://github.com/jupyterhub/chartpress) limits us from going above 3.12 on the helm builds.

Issue #850

* chore(python): update python versions in dockerfiles

* Update Dockerfile

* refreeze dockerfile

* new chartpress

* minimize golang/python version matrix

* Update build-publish-helm-chart.yaml

* Update test.yaml

* Restore unrelated change

---------

Co-authored-by: Erik Sundell <[email protected]>
  • Loading branch information
gardleopard and consideRatio authored Jan 22, 2025
1 parent 3a53345 commit d3b069c
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 14 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build-publish-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: "3.11"
# ref https://github.com/dask/dask-sphinx-theme/issues/68

- name: Install Python docs requirements
run: |
Expand All @@ -64,7 +65,7 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: "3.11"

# ref https://github.com/dask/dask-sphinx-theme/issues/68
- name: Install Python docs requirements
run: |
DASK_GATEWAY_SERVER__NO_PROXY=true pip install -r docs/requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-publish-helm-chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.13"

- name: Install chart publishing dependencies (chartpress, pyyaml, helm)
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-publish-python-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
- uses: actions/setup-go@v5
- uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.13"

- name: Install build package
run: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
--volume=$PWD:/opt/${{ matrix.image }} \
--workdir=/opt/${{ matrix.image }} \
--user=root \
python:3.11-slim-bullseye \
python:3.13-slim-bullseye \
sh -c 'pip install pip-tools==6.* && pip-compile --upgrade --output-file=Dockerfile.requirements.txt Dockerfile.requirements.in'
- name: git diff
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.13"

# Starts a k8s cluster with NetworkPolicy enforcement and installs both
# kubectl and helm
Expand Down
2 changes: 1 addition & 1 deletion dask-gateway-server/Dockerfile.requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.13
# by the following command:
#
# Use "Run workflow" button at https://github.com/dask/dask-gateway/actions/workflows/refreeze-dockerfile-requirements-txt.yaml
Expand Down
4 changes: 2 additions & 2 deletions dask-gateway/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# psutils, a dependency of distributed, is currently the sole reason we have to
# have this build stage.
#
FROM python:3.11-bullseye as build-stage
FROM python:3.13-bullseye as build-stage

# Build wheels
#
Expand All @@ -40,7 +40,7 @@ RUN --mount=type=cache,target=${PIP_CACHE_DIR} \
# The final stage
# ---------------
#
FROM python:3.11-slim-bullseye as slim-stage
FROM python:3.13-slim-bullseye as slim-stage

# Set labels based on the Open Containers Initiative (OCI):
# https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys
Expand Down
6 changes: 1 addition & 5 deletions dask-gateway/Dockerfile.requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.13
# by the following command:
#
# Use "Run workflow" button at https://github.com/dask/dask-gateway/actions/workflows/refreeze-dockerfile-requirements-txt.yaml
Expand Down Expand Up @@ -41,8 +41,6 @@ fsspec==2024.12.0
# via dask
idna==3.10
# via yarl
importlib-metadata==8.5.0
# via dask
jinja2==3.1.5
# via
# bokeh
Expand Down Expand Up @@ -118,5 +116,3 @@ yarl==1.18.3
# via aiohttp
zict==3.0.0
# via distributed
zipp==3.21.0
# via importlib-metadata
2 changes: 1 addition & 1 deletion dev-environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ name: dask-gateway-dev
channels:
- conda-forge
dependencies:
- python=3.11
- python=3.13
- pip

# Golang with compiler is required to compile dask-gateway-server's bundled
Expand Down

0 comments on commit d3b069c

Please sign in to comment.