Skip to content

Commit

Permalink
Upgrade to Python 3.13.
Browse files Browse the repository at this point in the history
  • Loading branch information
fniessink committed Nov 22, 2024
1 parent 943dae3 commit fe500c0
Show file tree
Hide file tree
Showing 18 changed files with 28 additions and 44 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ orbs:
jobs:
unittest_backend:
docker:
- image: cimg/python:3.12.7
- image: cimg/python:3.13
auth:
username: $DOCKERHUB_USERNAME
password: $DOCKERHUB_PASSWORD
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
export COMPOSE_FILE=docker/docker-compose.yml:docker/docker-compose.ci.yml
docker compose build && docker compose up -d
docker ps
docker run -it -w `pwd` -v `pwd`:`pwd` --network=container:docker-www-1 ghcr.io/astral-sh/uv:python3.12-bookworm tests/application_tests/ci/test.sh
docker run -it -w `pwd` -v `pwd`:`pwd` --network=container:docker-www-1 ghcr.io/astral-sh/uv:python3.13-bookworm tests/application_tests/ci/test.sh
docker ps
docker compose logs > build/containers.log
- run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/application-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
run: |
mkdir -p build
docker compose --file docker/docker-compose.yml --file docker/docker-compose.ci.yml --project-name quality-time up --build --detach --wait
docker run -t -w `pwd` -v `pwd`:`pwd` --network=container:quality-time-www-1 ghcr.io/astral-sh/uv:python3.12-bookworm tests/application_tests/ci/test.sh
docker run -t -w `pwd` -v `pwd`:`pwd` --network=container:quality-time-www-1 ghcr.io/astral-sh/uv:python3.13-bookworm tests/application_tests/ci/test.sh
- name: Save container logs
if: always()
run: |
Expand Down
12 changes: 6 additions & 6 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ version: 2
build:
os: ubuntu-22.04
tools:
python: "3.12"
python: "3.13"
apt_packages:
- graphviz

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/src/conf.py
configuration: docs/src/conf.py

# Additional formats to build
formats:
- pdf
- pdf

# Requirements to install
python:
install:
- requirements: docs/requirements/requirements-dev.txt
- requirements: docs/requirements/requirements-internal-rtd.txt
install:
- requirements: docs/requirements/requirements-dev.txt
- requirements: docs/requirements/requirements-internal-rtd.txt
4 changes: 2 additions & 2 deletions components/api_server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12.7-alpine3.20 AS compile-image
FROM python:3.13.0-alpine3.20 AS compile-image

WORKDIR /home/server

Expand All @@ -11,7 +11,7 @@ COPY api_server/requirements/requirements-internal.txt /requirements-internal.tx
COPY shared_code /home/shared_code/
RUN pip install --no-cache-dir --use-pep517 -r /requirements-internal.txt

FROM python:3.12.7-alpine3.20
FROM python:3.13.0-alpine3.20

LABEL maintainer="Quality-time team <[email protected]>"
LABEL description="Quality-time API-server"
Expand Down
4 changes: 1 addition & 3 deletions components/api_server/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[project]
name = "api-server"
version = "5.19.0-rc.1"
requires-python = ">=3.12"
requires-python = ">=3.13"
classifiers = [
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
]
dependencies = [
Expand Down Expand Up @@ -36,7 +35,6 @@ optional-dependencies.tools = [
]

[tool.ruff]
target-version = "py312"
line-length = 120
src = [
"src",
Expand Down
4 changes: 2 additions & 2 deletions components/collector/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12.7-alpine3.20 AS compile-image
FROM python:3.13.0-alpine3.20 AS compile-image

WORKDIR /home/collector

Expand All @@ -11,7 +11,7 @@ COPY shared_code /home/shared_code/
COPY collector/requirements/requirements-internal.txt /requirements-internal.txt
RUN pip install --no-cache-dir --use-pep517 -r /requirements-internal.txt

FROM python:3.12.7-alpine3.20
FROM python:3.13.0-alpine3.20

LABEL maintainer="Quality-time team <[email protected]>"
LABEL description="Quality-time collector"
Expand Down
4 changes: 1 addition & 3 deletions components/collector/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[project]
name = "collector"
version = "5.19.0-rc.1"
requires-python = ">=3.12"
requires-python = ">=3.13"
classifiers = [
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
]
dependencies = [
Expand Down Expand Up @@ -36,7 +35,6 @@ optional-dependencies.tools = [
]

[tool.ruff]
target-version = "py312"
line-length = 120
src = [
"src",
Expand Down
4 changes: 2 additions & 2 deletions components/notifier/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12.7-alpine3.20 AS compile-image
FROM python:3.13.0-alpine3.20 AS compile-image

WORKDIR /home/notifier

Expand All @@ -11,7 +11,7 @@ COPY shared_code /home/shared_code/
COPY notifier/requirements/requirements-internal.txt /requirements-internal.txt
RUN pip install --no-cache-dir --use-pep517 -r /requirements-internal.txt

FROM python:3.12.7-alpine3.20
FROM python:3.13.0-alpine3.20

LABEL maintainer="Quality-time team <[email protected]>"
LABEL description="Quality-time notifier"
Expand Down
4 changes: 1 addition & 3 deletions components/notifier/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[project]
name = "notifier"
version = "5.19.0-rc.1"
requires-python = ">=3.12"
requires-python = ">=3.13"
classifiers = [
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
]
dependencies = [
Expand All @@ -29,7 +28,6 @@ optional-dependencies.tools = [
]

[tool.ruff]
target-version = "py312"
line-length = 120
src = [
"src",
Expand Down
4 changes: 1 addition & 3 deletions components/shared_code/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[project]
name = "shared-code"
version = "5.19.0-rc.1"
requires-python = ">=3.12"
requires-python = ">=3.13"
classifiers = [
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
]
dependencies = [
Expand Down Expand Up @@ -38,7 +37,6 @@ where = [
]

[tool.ruff]
target-version = "py312"
line-length = 120
src = [
"src",
Expand Down
2 changes: 1 addition & 1 deletion components/testdata/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12.7-alpine3.20
FROM python:3.13.0-alpine3.20

LABEL maintainer="Quality-time team <[email protected]>"
LABEL description="Quality-time testdata"
Expand Down
4 changes: 1 addition & 3 deletions docs/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[project]
name = "docs"
version = "5.19.0-rc.1"
requires-python = ">=3.12"
requires-python = ">=3.13"
classifiers = [
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
]
dependencies = [
Expand Down Expand Up @@ -33,7 +32,6 @@ optional-dependencies.tools = [
]

[tool.ruff]
target-version = "py312"
line-length = 120
src = [
"src",
Expand Down
2 changes: 1 addition & 1 deletion docs/src/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# -- Project information -----------------------------------------------------

project = "Quality-time"
copyright = "2021-2023, ICTU" # noqa: A001
copyright = "2021-2024, ICTU" # noqa: A001
author = "ICTU"

# -- General configuration ---------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions docs/src/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ If you want to get *Quality-time* up and running quickly, for example for a demo

#### Install prerequisites

Prerequisites are Docker and Git for both scenario's. For scenario 2 you also need Python 3.12, [uv](https://github.com/astral-sh/uv), and a recent version of Node.js (we currently use Node.js v22).
Prerequisites are Docker and Git for both scenario's. For scenario 2 you also need Python 3.13, [uv](https://github.com/astral-sh/uv), and a recent version of Node.js (we currently use Node.js v22).

Clone this repository:

Expand Down Expand Up @@ -441,7 +441,7 @@ The application tests in theory test all components through the frontend, but un

```console
docker-compose up -d
docker run -it -w `pwd` -v `pwd`:`pwd` --network=container:qualitytime_www_1 ghcr.io/astral-sh/uv:python3.12-bookworm tests/application_tests/ci/test.sh
docker run -it -w `pwd` -v `pwd`:`pwd` --network=container:qualitytime_www_1 ghcr.io/astral-sh/uv:python3.13-bookworm tests/application_tests/ci/test.sh
```

## Documentation and changelog
Expand Down
4 changes: 1 addition & 3 deletions release/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[project]
name = "release"
version = "5.19.0-rc.1"
requires-python = ">=3.12"
requires-python = ">=3.13"
classifiers = [
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
]
dependencies = [
Expand All @@ -22,7 +21,6 @@ optional-dependencies.tools = [
]

[tool.ruff]
target-version = "py312"
line-length = 120
src = [
"src",
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ sonar.projectVersion=5.19.0-rc.1
# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
# This property is optional if sonar.modules is set.
sonar.sources=components/collector,components/notifier,components/api_server,components/shared_code,components/frontend
sonar.python.version=3.12
sonar.python.version=3.13

# Exclude third party software and generated code from analysis
sonar.exclusions=**/coverage/**/*,**/build/**/*,**/node_modules/**/*
Expand Down
4 changes: 1 addition & 3 deletions tests/application_tests/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[project]
name = "application-tests"
version = "5.19.0-rc.1"
requires-python = ">=3.12"
requires-python = ">=3.13"
classifiers = [
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
]
dependencies = [
Expand All @@ -26,7 +25,6 @@ optional-dependencies.tools = [
]

[tool.ruff]
target-version = "py312"
line-length = 120
src = [
"src",
Expand Down
4 changes: 1 addition & 3 deletions tests/feature_tests/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[project]
name = "feature-tests"
version = "5.19.0-rc.1"
requires-python = ">=3.12"
requires-python = ">=3.13"
classifiers = [
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
]
dependencies = [
Expand All @@ -31,7 +30,6 @@ optional-dependencies.tools = [
]

[tool.ruff]
target-version = "py312"
line-length = 120
src = [
"src",
Expand Down

0 comments on commit fe500c0

Please sign in to comment.