From c90ca5e52698bafc434138b6a0641e7e60ea904b Mon Sep 17 00:00:00 2001 From: Stephen Rosen Date: Tue, 29 Aug 2023 19:47:34 -0500 Subject: [PATCH 1/4] Update config to drop py3.7 and add 3.12 Update configs to add 3.12.0rc1 to build matrix. Also update requires-python data. --- .github/workflows/build.yaml | 3 ++- pyproject.toml | 5 ++--- tox.ini | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index db28319d..d18896bf 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -43,7 +43,7 @@ jobs: # any additional builds for windows and macos # handled via `include` to avoid an over-large test matrix os: [ubuntu-latest] - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12-dev", "pypy-3.9"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "pypy-3.9"] include: - os: windows-latest python-version: "3.x" @@ -56,6 +56,7 @@ jobs: - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} + allow-prereleases: true - name: install tox run: python -m pip install -U tox - name: test diff --git a/pyproject.toml b/pyproject.toml index d5daccdc..f733c4b8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,7 @@ license = {text = "BSD-2-Clause"} authors = [ { name = "Stephen Rosen", email = "dev@nose2.io" }, ] -requires-python = ">=3.6" +requires-python = ">=3.8" classifiers=[ "Development Status :: 4 - Beta", "Environment :: Console", @@ -26,12 +26,11 @@ classifiers=[ "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", "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 :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Software Development :: Libraries", diff --git a/tox.ini b/tox.ini index ac1978fa..d6445708 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist=py{37,38,39,310,311}{,-nocov},pypy,docs,lint +envlist=py{38,39,310,311,312}{,-nocov},pypy,docs,lint [testenv] passenv = CI From 8d47a932357a71aca26cdd669cac9692233d0414 Mon Sep 17 00:00:00 2001 From: Stephen Rosen Date: Tue, 29 Aug 2023 19:56:01 -0500 Subject: [PATCH 2/4] Remove ruff from GHA This is already run in pre-commit there is no benefit to running it twice. --- .github/workflows/build.yaml | 7 ------- pyproject.toml | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d18896bf..ec6123e7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -6,13 +6,6 @@ on: schedule: - cron: '0 4 * * 1' jobs: - ruff: # https://beta.ruff.rs - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - run: pip install --user ruff - - run: ruff --format=github . - # this job ensures that tests can run from the packaged version, which means # that nose2 is correctly packaging and distributing its tests test-sdist: diff --git a/pyproject.toml b/pyproject.toml index f733c4b8..fd06d743 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -115,7 +115,7 @@ ignore = [ "RUF005", "RUF100" ] -target-version = "py37" +target-version = "py38" [tool.ruff.isort] known-third-party = [ From 6e4ae623dbe75cbbba14e319324d0d8bb23e98b5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 30 Aug 2023 00:56:45 +0000 Subject: [PATCH 3/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index fd06d743..e46d4d90 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,6 @@ classifiers=[ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Software Development :: Libraries", From a195ac0a3f14b394e60f7a6cb3c69d7ff30e24f2 Mon Sep 17 00:00:00 2001 From: Stephen Rosen Date: Tue, 29 Aug 2023 20:01:03 -0500 Subject: [PATCH 4/4] Update pyproject-fmt to use tox --- .pre-commit-config.yaml | 3 ++- pyproject.toml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1859ca61..e383f737 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -33,6 +33,7 @@ repos: hooks: - id: validate-pyproject - repo: https://github.com/tox-dev/pyproject-fmt - rev: 0.11.2 + rev: 1.1.0 hooks: - id: pyproject-fmt + additional_dependencies: ["tox>=4.9"] diff --git a/pyproject.toml b/pyproject.toml index e46d4d90..fd06d743 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,6 +30,7 @@ classifiers=[ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Software Development :: Libraries",