Skip to content

Commit

Permalink
Merge pull request #3 from hypothesis/remove-old-python-versions
Browse files Browse the repository at this point in the history
Remove older versions of Python
  • Loading branch information
seanh authored Oct 25, 2023
2 parents 04319c2 + 023c22a commit 388e079
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .cookiecutter/cookiecutter.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"package_name": "dependabot_alerts",
"slug": "dependabot-alerts",
"short_description": "Notifications of Dependabot alerts across a GitHub organization.",
"python_versions": "3.12.0, 3.11.6, 3.10.13, 3.9.18, 3.8.18",
"python_versions": "3.12.0, 3.11.6",
"github_owner": "hypothesis",
"copyright_holder": "Hypothesis",
"visibility": "public",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,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']
name: Unit tests with Python ${{ matrix.python-version }}
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -75,7 +75,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']
name: Functional tests with Python ${{ matrix.python-version }}
steps:
- uses: actions/checkout@v3
Expand Down
3 changes: 0 additions & 3 deletions .python-version
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
3.12.0
3.11.6
3.10.13
3.9.18
3.8.18
34 changes: 2 additions & 32 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,10 @@ $(call help,make test-py311,"run the unit tests in Python 3.11")
test-py311: python
@pyenv exec tox -qe py311-tests

.PHONY: test-py310
$(call help,make test-py310,"run the unit tests in Python 3.10")
test-py310: python
@pyenv exec tox -qe py310-tests

.PHONY: test-py39
$(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}-tests,coverage'

.PHONY: functests
$(call help,make functests,"run the functional tests in Python 3.12")
Expand All @@ -68,26 +53,11 @@ $(call help,make functests-py311,"run the functional tests in Python 3.11")
functests-py311: python
@pyenv exec tox -qe py311-functests

.PHONY: functests-py310
$(call help,make functests-py310,"run the functional tests in Python 3.10")
functests-py310: python
@pyenv exec tox -qe py310-functests

.PHONY: functests-py39
$(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,tests,py{311,310,39,38}-tests,coverage,functests,py{311,310,39,38}-functests'
@pyenv exec tox --parallel -qe 'checkformatting,lint,tests,py{311}-tests,coverage,functests,py{311}-functests'

.PHONY: template
$(call help,make template,"update from the latest cookiecutter template")
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<a href="https://github.com/hypothesis/dependabot-alerts/actions/workflows/ci.yml?query=branch%3Amain"><img src="https://img.shields.io/github/actions/workflow/status/hypothesis/dependabot-alerts/ci.yml?branch=main"></a>
<a><img src="https://img.shields.io/badge/python-3.12 | 3.11 | 3.10 | 3.9 | 3.8-success"></a>
<a><img src="https://img.shields.io/badge/python-3.12 | 3.11-success"></a>
<a href="https://github.com/hypothesis/dependabot-alerts/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-BSD--2--Clause-success"></a>
<a href="https://github.com/hypothesis/cookiecutters/tree/main/pypackage"><img src="https://img.shields.io/badge/cookiecutter-pypackage-success"></a>
<a href="https://black.readthedocs.io/en/stable/"><img src="https://img.shields.io/badge/code%20style-black-000000"></a>
Expand Down
2 changes: 1 addition & 1 deletion bin/make_python
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if [ -n "${CI+x}" ]; then exit; fi

pyenv_root=$(pyenv root)

for python_version in 3.12.0 3.11.6 3.10.13 3.9.18 3.8.18; do
for python_version in 3.12.0 3.11.6; do
bin_dir=$pyenv_root/versions/$python_version/bin
if [ ! -f "$bin_dir"/tox ]; then
pyenv install --skip-existing "$python_version"
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ classifiers =
package_dir =
= src
packages = find:
python_requires = >=3.8
python_requires = >=3.11
install_requires =
requests

Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ deps =
lint,tests,functests: h-matchers
lint,template: cookiecutter
depends =
coverage: tests,py{311,310,39,38}-tests
coverage: tests,py{311}-tests
commands =
dev: {posargs:ipython --classic --no-banner --no-confirm-exit}
format: black src tests bin
Expand Down

0 comments on commit 388e079

Please sign in to comment.