From b853f3e7b29a04894f3d4dd65ba16abc6f98fe10 Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Wed, 8 Nov 2023 23:30:39 +0100 Subject: [PATCH] Require Python 3.9, run tests with 3.12 --- .github/workflows/python-tests.yml | 2 +- .pre-commit-config.yaml | 6 +++--- docs/changelog.rst | 2 ++ docs/conf.py | 2 +- pyproject.toml | 10 +++------- tox.ini | 6 +++--- 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index 937218d..31af461 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.8, 3.9, "3.10", "3.11"] + python-version: [3.9, "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v2 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index eb0d735..f751d68 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-added-large-files - id: check-merge-conflict @@ -12,12 +12,12 @@ repos: exclude: ".*(galleria|photoswipe|jquery|leaflet).*$" - repo: https://github.com/psf/black - rev: 23.9.1 + rev: 23.11.0 hooks: - id: black - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: v0.0.291 + rev: v0.1.4 hooks: - id: ruff args: [ --fix, --show-fixes, --exit-non-zero-on-fix ] diff --git a/docs/changelog.rst b/docs/changelog.rst index 4968f75..d2e5349 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -7,6 +7,8 @@ Version 2.5dev Not released yet. +Sigal now requires Python 3.9+. + Version 2.4 ~~~~~~~~~~~ diff --git a/docs/conf.py b/docs/conf.py index a184308..dc630dd 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -90,7 +90,7 @@ html_theme_options = { - """, + """, # noqa: E501 "class": "", }, ], diff --git a/pyproject.toml b/pyproject.toml index 20da527..4ffb392 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,15 +15,11 @@ classifiers = [ "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", "Topic :: Internet :: WWW/HTTP", "Topic :: Multimedia :: Graphics :: Viewers", "Topic :: Software Development :: Libraries :: Python Modules", ] -requires-python = ">=3.8" +requires-python = ">=3.9" dependencies = [ "blinker", "click", @@ -66,10 +62,10 @@ write_to = "src/sigal/version.py" [tool.black] line-length = 88 -target-version = ['py38'] +target-version = ['py39'] [tool.ruff] -target-version = "py38" +target-version = "py39" select = [ "E", "F", "W", # flake8 "I", # isort diff --git a/tox.ini b/tox.ini index 726124b..cbef192 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,13 @@ [tox] -envlist = py{38,39,310,311}-pillow{80,90,100,-latest},pypy3,check +envlist = py{39,310,311,312}-pillow{80,90,100,-latest},pypy3,check skip_missing_interpreters = true [gh-actions] python = - 3.8: py38-pillow80, check 3.9: py39-pillow90 3.10: py310-pillow100 - 3.11: py310-pillow-latest + 3.11: py311-pillow-latest + 3.12: py312-pillow-latest pypy3: pypy3 [testenv]