From 7d575706502ff7f41a3f2a9f3be6a095ec790e21 Mon Sep 17 00:00:00 2001 From: Matthias Kestenholz Date: Fri, 22 Nov 2024 17:36:08 +0100 Subject: [PATCH] Add Python 3.13, drop old versions --- .github/workflows/tests.yml | 1 + .pre-commit-config.yaml | 12 ++++++------ CHANGELOG.rst | 3 +++ biome.json | 2 +- .../static/content_editor/material-icons.css | 2 +- pyproject.toml | 7 +++---- tox.ini | 5 ++--- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3a6b4df3..cc683c8f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,6 +19,7 @@ jobs: - "3.10" - "3.11" - "3.12" + - "3.13" steps: - uses: actions/checkout@v4 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d633b1d7..96d38b95 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ exclude: ".yarn/|yarn.lock|\\.min\\.(css|js)$" repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: check-added-large-files - id: check-builtin-literals @@ -14,12 +14,12 @@ repos: - id: mixed-line-ending - id: trailing-whitespace - repo: https://github.com/adamchainz/django-upgrade - rev: 1.21.0 + rev: 1.22.1 hooks: - id: django-upgrade args: [--target-version, "3.2"] - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.6.7" + rev: "v0.8.0" hooks: - id: ruff args: [--unsafe-fixes] @@ -28,13 +28,13 @@ repos: rev: "v0.5.0" hooks: - id: biome-check - additional_dependencies: ["@biomejs/biome@1.9.2"] + additional_dependencies: ["@biomejs/biome@1.9.4"] args: [--unsafe] - repo: https://github.com/tox-dev/pyproject-fmt - rev: 2.2.4 + rev: v2.5.0 hooks: - id: pyproject-fmt - repo: https://github.com/abravalheri/validate-pyproject - rev: v0.19 + rev: v0.23 hooks: - id: validate-pyproject diff --git a/CHANGELOG.rst b/CHANGELOG.rst index cc47c67b..23802732 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,9 @@ Change log Next version ============ +- Added Python 3.13. Removed Python 3.8 and 3.9. + + 7.1 (2024-10-02) ================ diff --git a/biome.json b/biome.json index 544719cb..0cc1ceb5 100644 --- a/biome.json +++ b/biome.json @@ -1,5 +1,5 @@ { - "$schema": "https://biomejs.dev/schemas/1.9.2/schema.json", + "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json", "organizeImports": { "enabled": false }, diff --git a/content_editor/static/content_editor/material-icons.css b/content_editor/static/content_editor/material-icons.css index 3d5653f2..d77a6346 100644 --- a/content_editor/static/content_editor/material-icons.css +++ b/content_editor/static/content_editor/material-icons.css @@ -1,6 +1,6 @@ /* npx google-font-downloader "https://fonts.googleapis.com/icon?family=Material+Icons" -Current version: v141 +Current version: v142 */ /* fallback */ diff --git a/pyproject.toml b/pyproject.toml index f04112f5..9708da9d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ license = { text = "BSD-3-Clause" } authors = [ { name = "Matthias Kestenholz", email = "mk@feinheit.ch" }, ] -requires-python = ">=3.8" +requires-python = ">=3.10" classifiers = [ "Development Status :: 5 - Production/Stable", "Environment :: Web Environment", @@ -22,11 +22,10 @@ classifiers = [ "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Internet :: WWW/HTTP :: Dynamic Content", "Topic :: Software Development", "Topic :: Software Development :: Libraries :: Application Frameworks", @@ -52,7 +51,7 @@ include = [ path = "content_editor/__init__.py" [tool.ruff] -target-version = "py38" +target-version = "py310" fix = true show-fixes = true diff --git a/tox.ini b/tox.ini index 78842c27..8eaa2c11 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] envlist = - py{38,39,310}-dj{32,41} - py{310,311}-dj{32,41,42,main} + py{310,311}-dj{42,main} py{312}-dj{42,50,51,main} + py{313}-dj{51,main} docs [testenv] @@ -13,7 +13,6 @@ commands = coverage report -m deps = dj32: Django>=3.2,<4.0 - dj41: Django>=4.1,<4.2 dj42: Django>=4.2,<5.0 dj50: Django>=5.0,<5.1 dj51: Django>=5.1,<5.2