From ab8d49db818903bf1ea96eca6c66440762bac379 Mon Sep 17 00:00:00 2001 From: Misha Tomilov Date: Thu, 16 Jan 2025 15:48:45 +0100 Subject: [PATCH] Upgrade python patch versions and drop 3.8 (#42) --- .cookiecutter/cookiecutter.json | 2 +- .github/workflows/ci.yml | 4 ++-- .python-version | 9 ++++----- Makefile | 14 ++------------ README.md | 2 +- bin/make_python | 2 +- pyproject.toml | 1 + setup.cfg | 2 +- tox.ini | 2 +- 9 files changed, 14 insertions(+), 24 deletions(-) diff --git a/.cookiecutter/cookiecutter.json b/.cookiecutter/cookiecutter.json index df518b0..cfce871 100644 --- a/.cookiecutter/cookiecutter.json +++ b/.cookiecutter/cookiecutter.json @@ -10,7 +10,7 @@ "package_name": "tox_recreate", "slug": "tox-recreate", "short_description": "Recreate tox virtual environments when setup.cfg changes.", - "python_versions": "3.12.4, 3.11.9, 3.10.14, 3.9.19, 3.8.19", + "python_versions": "3.12.7, 3.11.10, 3.10.15, 3.9.20", "github_owner": "hypothesis", "copyright_holder": "Hypothesis", "public": "yes", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3eda4af..af1b7e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.12', '3.11', '3.10', '3.9', '3.8'] + python-version: ['3.12', '3.11', '3.10', '3.9'] name: Unit tests with Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v3 @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.12', '3.11', '3.10', '3.9', '3.8'] + python-version: ['3.12', '3.11', '3.10', '3.9'] name: Functional tests with Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v3 diff --git a/.python-version b/.python-version index 29afc11..23cac87 100644 --- a/.python-version +++ b/.python-version @@ -1,5 +1,4 @@ -3.12.4 -3.11.9 -3.10.14 -3.9.19 -3.8.19 +3.12.7 +3.11.10 +3.10.15 +3.9.20 diff --git a/Makefile b/Makefile index 6f2f850..a061883 100644 --- a/Makefile +++ b/Makefile @@ -53,15 +53,10 @@ $(call help,make test-py39,"run the unit tests in Python 3.9") test-py39: python @pyenv exec tox -qe py39-tests -.PHONY: test-py38 -$(call help,make test-py38,"run the unit tests in Python 3.8") -test-py38: python - @pyenv exec tox -qe py38-tests - .PHONY: coverage $(call help,make coverage,"run the tests and print the coverage report") coverage: python - @pyenv exec tox --parallel -qe 'tests,py{311,310,39,38}-tests,coverage' + @pyenv exec tox --parallel -qe 'tests,py{311,310,39}-tests,coverage' .PHONY: functests $(call help,make functests,"run the functional tests in Python 3.12") @@ -83,16 +78,11 @@ $(call help,make functests-py39,"run the functional tests in Python 3.9") functests-py39: python @pyenv exec tox -qe py39-functests -.PHONY: functests-py38 -$(call help,make functests-py38,"run the functional tests in Python 3.8") -functests-py38: python - @pyenv exec tox -qe py38-functests - .PHONY: sure $(call help,make sure,"make sure that the formatting$(comma) linting and tests all pass") sure: python sure: - @pyenv exec tox --parallel -qe 'checkformatting,lint,typecheck,tests,py{311,310,39,38}-tests,coverage,functests,py{311,310,39,38}-functests' + @pyenv exec tox --parallel -qe 'checkformatting,lint,typecheck,tests,py{311,310,39}-tests,coverage,functests,py{311,310,39}-functests' .PHONY: template $(call help,make template,"update from the latest cookiecutter template") diff --git a/README.md b/README.md index 5f220c7..b579635 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ - + diff --git a/bin/make_python b/bin/make_python index a2266ab..9721005 100755 --- a/bin/make_python +++ b/bin/make_python @@ -8,7 +8,7 @@ if [ -n "${CI+x}" ]; then exit; fi pyenv_root=$(pyenv root) -for python_version in 3.12.4 3.11.9 3.10.14 3.9.19 3.8.19; do +for python_version in 3.12.7 3.11.10 3.10.15 3.9.20; do bin_dir=$pyenv_root/versions/$python_version/bin if [ ! -f "$bin_dir"/tox ]; then pyenv install --skip-existing "$python_version" diff --git a/pyproject.toml b/pyproject.toml index a8f3ece..6d7c677 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,6 +14,7 @@ filterwarnings = [ "ignore:^pkg_resources is deprecated as an API:DeprecationWarning:pyramid", "ignore:^Deprecated call to .pkg_resources\\.declare_namespace\\('.*'\\).\\.:DeprecationWarning:pkg_resources", "ignore:^'cgi' is deprecated and slated for removal in Python 3\\.13$:DeprecationWarning:webob", + "ignore:^datetime\\.datetime\\.utcnow\\(\\) is deprecated and scheduled for removal in a future version\\.:DeprecationWarning", ] [tool.pydocstyle] diff --git a/setup.cfg b/setup.cfg index c24cceb..3d7186b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,7 +16,7 @@ classifiers = package_dir = = src packages = find: -python_requires = >=3.8 +python_requires = >=3.9 install_requires = [options.packages.find] diff --git a/tox.ini b/tox.ini index 21d2202..2507b7e 100644 --- a/tox.ini +++ b/tox.ini @@ -46,7 +46,7 @@ deps = typecheck: mypy pluggy depends = - coverage: tests,py{311,310,39,38}-tests + coverage: tests,py{311,310,39}-tests commands = dev: {posargs:ipython --classic --no-banner --no-confirm-exit} format: black src tests bin