Skip to content

Commit 6de9124

Browse files
mtomilovseanh
authored andcommitted
Upgrade python patch versions and drop 3.8
1 parent e2b139e commit 6de9124

File tree

8 files changed

+48
-26
lines changed

8 files changed

+48
-26
lines changed

.cookiecutter/cookiecutter.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"package_name": "h_pyramid_sentry",
1212
"slug": "h-pyramid-sentry",
1313
"short_description": "A library which integrates Sentry logging into Pyramid with the ability to filter out unwanted messages.",
14-
"python_versions": "3.9.13,3.8.13",
14+
"python_versions": "3.12.7, 3.11.10, 3.10.15, 3.9.20",
1515
"github_owner": "hypothesis",
1616
"copyright_holder": "Hypothesis",
1717
"visibility": "public",
@@ -25,4 +25,4 @@
2525
"__copyright_year": "2022",
2626
"pypi": "yes"
2727
}
28-
}
28+
}

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Install Python
2323
uses: actions/setup-python@v4
2424
with:
25-
python-version: '3.9'
25+
python-version: '3.12'
2626
- run: python -m pip install 'tox<4'
2727
- run: tox -e checkformatting
2828
Lint:
@@ -32,7 +32,7 @@ jobs:
3232
- name: Install Python
3333
uses: actions/setup-python@v4
3434
with:
35-
python-version: '3.9'
35+
python-version: '3.12'
3636
- run: python -m pip install 'tox<4'
3737
- run: tox -e lint
3838
Typecheck:
@@ -42,14 +42,14 @@ jobs:
4242
- name: Install Python
4343
uses: actions/setup-python@v4
4444
with:
45-
python-version: '3.9'
45+
python-version: '3.12'
4646
- run: python -m pip install 'tox<4'
4747
- run: tox -e typecheck
4848
Tests:
4949
runs-on: ubuntu-latest
5050
strategy:
5151
matrix:
52-
python-version: ['3.9', '3.8']
52+
python-version: ['3.12', '3.11', '3.10', '3.9']
5353
name: Unit tests with Python ${{ matrix.python-version }}
5454
steps:
5555
- uses: actions/checkout@v3
@@ -75,7 +75,7 @@ jobs:
7575
- name: Install Python
7676
uses: actions/setup-python@v4
7777
with:
78-
python-version: '3.9'
78+
python-version: '3.12'
7979
- name: Download coverage files
8080
uses: actions/download-artifact@v4
8181
with:
@@ -87,7 +87,7 @@ jobs:
8787
runs-on: ubuntu-latest
8888
strategy:
8989
matrix:
90-
python-version: ['3.9', '3.8']
90+
python-version: ['3.12', '3.11', '3.10', '3.9']
9191
name: Functional tests with Python ${{ matrix.python-version }}
9292
steps:
9393
- uses: actions/checkout@v3

.python-version

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
3.9.13
2-
3.8.13
1+
3.12.7
2+
3.11.10
3+
3.10.15
4+
3.9.20

Makefile

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,35 +34,55 @@ checkformatting: python
3434
@pyenv exec tox -qe checkformatting
3535

3636
.PHONY: test
37-
$(call help,make test,"run the unit tests in Python 3.9")
37+
$(call help,make test,"run the unit tests in Python 3.12")
3838
test: python
3939
@pyenv exec tox -qe tests
4040

41-
.PHONY: test-py38
42-
$(call help,make test-py38,"run the unit tests in Python 3.8")
43-
test-py38: python
44-
@pyenv exec tox -qe py38-tests
41+
.PHONY: test-py311
42+
$(call help,make test-py311,"run the unit tests in Python 3.11")
43+
test-py311: python
44+
@pyenv exec tox -qe py311-tests
45+
46+
.PHONY: test-py310
47+
$(call help,make test-py310,"run the unit tests in Python 3.10")
48+
test-py310: python
49+
@pyenv exec tox -qe py310-tests
50+
51+
.PHONY: test-py39
52+
$(call help,make test-py39,"run the unit tests in Python 3.9")
53+
test-py39: python
54+
@pyenv exec tox -qe py39-tests
4555

4656
.PHONY: coverage
4757
$(call help,make coverage,"run the tests and print the coverage report")
4858
coverage: python
49-
@pyenv exec tox --parallel -qe 'tests,py{38}-tests,coverage'
59+
@pyenv exec tox --parallel -qe 'tests,py{311,310,39}-tests,coverage'
5060

5161
.PHONY: functests
52-
$(call help,make functests,"run the functional tests in Python 3.9")
62+
$(call help,make functests,"run the functional tests in Python 3.12")
5363
functests: python
5464
@pyenv exec tox -qe functests
5565

56-
.PHONY: functests-py38
57-
$(call help,make functests-py38,"run the functional tests in Python 3.8")
58-
functests-py38: python
59-
@pyenv exec tox -qe py38-functests
66+
.PHONY: functests-py311
67+
$(call help,make functests-py311,"run the functional tests in Python 3.11")
68+
functests-py311: python
69+
@pyenv exec tox -qe py311-functests
70+
71+
.PHONY: functests-py310
72+
$(call help,make functests-py310,"run the functional tests in Python 3.10")
73+
functests-py310: python
74+
@pyenv exec tox -qe py310-functests
75+
76+
.PHONY: functests-py39
77+
$(call help,make functests-py39,"run the functional tests in Python 3.9")
78+
functests-py39: python
79+
@pyenv exec tox -qe py39-functests
6080

6181
.PHONY: sure
6282
$(call help,make sure,"make sure that the formatting$(comma) linting and tests all pass")
6383
sure: python
6484
sure:
65-
@pyenv exec tox --parallel -qe 'checkformatting,lint,typecheck,tests,py{38}-tests,coverage,functests,py{38}-functests'
85+
@pyenv exec tox --parallel -qe 'checkformatting,lint,typecheck,tests,py{311,310,39}-tests,coverage,functests,py{311,310,39}-functests'
6686

6787
.PHONY: template
6888
$(call help,make template,"update from the latest cookiecutter template")

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<a href="https://github.com/hypothesis/h-pyramid-sentry/actions/workflows/ci.yml?query=branch%3Amain"><img src="https://img.shields.io/github/actions/workflow/status/hypothesis/h-pyramid-sentry/ci.yml?branch=main"></a>
22
<a href="https://pypi.org/project/h-pyramid-sentry"><img src="https://img.shields.io/pypi/v/h-pyramid-sentry"></a>
3-
<a><img src="https://img.shields.io/badge/python-3.9 | 3.8-success"></a>
3+
<a><img src="https://img.shields.io/badge/python-3.12 | 3.11 | 3.10 | 3.9-success"></a>
44
<a href="https://github.com/hypothesis/h-pyramid-sentry/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-BSD--2--Clause-success"></a>
55
<a href="https://github.com/hypothesis/cookiecutters/tree/main/pypackage"><img src="https://img.shields.io/badge/cookiecutter-pypackage-success"></a>
66
<a href="https://black.readthedocs.io/en/stable/"><img src="https://img.shields.io/badge/code%20style-black-000000"></a>

bin/make_python

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if [ -n "${CI+x}" ]; then exit; fi
88

99
pyenv_root=$(pyenv root)
1010

11-
for python_version in 3.9.13 3.8.13; do
11+
for python_version in 3.12.7 3.11.10 3.10.15 3.9.20; do
1212
bin_dir=$pyenv_root/versions/$python_version/bin
1313
if [ ! -f "$bin_dir"/tox ]; then
1414
pyenv install --skip-existing "$python_version"

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ classifiers = [
1212
"License :: OSI Approved :: BSD License",
1313
"Intended Audience :: Developers",
1414
]
15-
requires-python = ">=3.8"
15+
requires-python = ">=3.9"
1616
dependencies = [
1717
"sentry-sdk",
1818
"pyramid",

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ deps =
4747
typecheck,lint,tests: pyramid-retry
4848
typechectk,lint,tests: sqlalchemy
4949
depends =
50-
coverage: tests,py{38}-tests
50+
coverage: tests,py{311,310,39}-tests
5151
commands =
5252
dev: {posargs:ipython --classic --no-banner --no-confirm-exit}
5353
format: black src tests bin

0 commit comments

Comments
 (0)