From 8ffe06854a0ea16e16f4d5f63a70b3edb586ed42 Mon Sep 17 00:00:00 2001 From: Sean Hammond Date: Tue, 11 Jun 2024 14:31:18 +0100 Subject: [PATCH] Remove Python 3.7 pytest no longer supports it --- .cookiecutter/cookiecutter.json | 2 +- .github/workflows/ci.yml | 4 ++-- .python-version | 1 - Makefile | 14 ++------------ README.md | 2 +- bin/make_python | 2 +- setup.cfg | 2 +- tox.ini | 2 +- 8 files changed, 9 insertions(+), 20 deletions(-) diff --git a/.cookiecutter/cookiecutter.json b/.cookiecutter/cookiecutter.json index 1599b8e..b78b092 100644 --- a/.cookiecutter/cookiecutter.json +++ b/.cookiecutter/cookiecutter.json @@ -10,7 +10,7 @@ "package_name": "tox_faster", "slug": "tox-faster", "short_description": "A tox plugin that speeds up tox a little.", - "python_versions": "3.10.6, 3.9.13, 3.8.13, 3.7.13", + "python_versions": "3.10.6, 3.9.13, 3.8.13", "github_owner": "hypothesis", "copyright_holder": "Hypothesis", "public": "yes", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3369792..3b770a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.10', '3.9', '3.8', '3.7'] + python-version: ['3.10', '3.9', '3.8'] name: Unit tests with Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v3 @@ -75,7 +75,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.10', '3.9', '3.8', '3.7'] + python-version: ['3.10', '3.9', '3.8'] name: Functional tests with Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v3 diff --git a/.python-version b/.python-version index f1e2c19..918735a 100644 --- a/.python-version +++ b/.python-version @@ -1,4 +1,3 @@ 3.10.6 3.9.13 3.8.13 -3.7.13 diff --git a/Makefile b/Makefile index 53c230f..1c11aa9 100644 --- a/Makefile +++ b/Makefile @@ -48,15 +48,10 @@ $(call help,make test-py38,"run the unit tests in Python 3.8") test-py38: python @pyenv exec tox -qe py38-tests -.PHONY: test-py37 -$(call help,make test-py37,"run the unit tests in Python 3.7") -test-py37: python - @pyenv exec tox -qe py37-tests - .PHONY: coverage $(call help,make coverage,"run the tests and print the coverage report") coverage: python - @pyenv exec tox --parallel -qe 'tests,py{39,38,37}-tests,coverage' + @pyenv exec tox --parallel -qe 'tests,py{39,38}-tests,coverage' .PHONY: functests $(call help,make functests,"run the functional tests in Python 3.10") @@ -73,16 +68,11 @@ $(call help,make functests-py38,"run the functional tests in Python 3.8") functests-py38: python @pyenv exec tox -qe py38-functests -.PHONY: functests-py37 -$(call help,make functests-py37,"run the functional tests in Python 3.7") -functests-py37: python - @pyenv exec tox -qe py37-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,tests,py{39,38,37}-tests,coverage,functests,py{39,38,37}-functests' + @pyenv exec tox --parallel -qe 'checkformatting,lint,tests,py{39,38}-tests,coverage,functests,py{39,38}-functests' .PHONY: template $(call help,make template,"update from the latest cookiecutter template") diff --git a/README.md b/README.md index 2f1e1c9..1af1265 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ - + diff --git a/bin/make_python b/bin/make_python index 989fbb8..4573bfd 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.10.6 3.9.13 3.8.13 3.7.13; do +for python_version in 3.10.6 3.9.13 3.8.13; do bin_dir=$pyenv_root/versions/$python_version/bin if [ ! -f "$bin_dir"/tox ]; then pyenv install --skip-existing "$python_version" diff --git a/setup.cfg b/setup.cfg index ebcc759..0abb477 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,7 +16,7 @@ classifiers = package_dir = = src packages = find: -python_requires = >=3.7 +python_requires = >=3.8 install_requires = [options.packages.find] diff --git a/tox.ini b/tox.ini index 199cc78..6357985 100644 --- a/tox.ini +++ b/tox.ini @@ -46,7 +46,7 @@ deps = typecheck: mypy pluggy depends = - coverage: tests,py{39,38,37}-tests + coverage: tests,py{39,38}-tests commands = dev: {posargs:ipython --classic --no-banner --no-confirm-exit} format: black src tests bin