Skip to content

Commit 394cf77

Browse files
authored
py312 (#70)
updates to tox and ci for - Python 3.12 - testing pytest versions 4, 5, 6
1 parent 6d8c6b0 commit 394cf77

File tree

4 files changed

+62
-12
lines changed

4 files changed

+62
-12
lines changed

.github/workflows/test.yml

Lines changed: 52 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@ jobs:
3131
strategy:
3232
fail-fast: false
3333
matrix:
34-
python: ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.9", "pypy3.10"]
34+
python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy3.10"]
3535
os: [ubuntu-latest, windows-latest]
3636
include:
3737
- python: "3.7"
38-
tox_env: "py37"
38+
tox_env: "py37-pytest7"
3939
- python: "3.8"
40-
tox_env: "py38"
40+
tox_env: "py38-pytest7"
4141
- python: "3.9"
42-
tox_env: "py39"
42+
tox_env: "py39-pytest7"
4343
- python: "3.10"
44-
tox_env: "py310"
44+
tox_env: "py310-pytest7"
4545
- python: "3.11"
46-
tox_env: "py311"
47-
- python: "pypy3.9"
48-
tox_env: "pypy3"
46+
tox_env: "py311-pytest7"
47+
- python: "3.12"
48+
tox_env: "py312-pytest7"
4949
- python: "pypy3.10"
50-
tox_env: "pypy3"
50+
tox_env: "pypy3-pytest7"
5151

5252
steps:
5353
- uses: actions/checkout@v3
@@ -70,4 +70,46 @@ jobs:
7070
7171
- name: Test
7272
shell: bash
73-
run: tox run -e ${{ matrix.tox_env }}
73+
run: tox run -e ${{ matrix.tox_env }}
74+
75+
76+
test-legacy-pytest:
77+
78+
needs: [package]
79+
80+
runs-on: ubuntu-latest
81+
82+
strategy:
83+
fail-fast: false
84+
matrix:
85+
pytest: ["4", "5", "6"]
86+
include:
87+
- pytest: "4"
88+
tox_env: "py37-pytest4"
89+
- pytest: "5"
90+
tox_env: "py37-pytest5"
91+
- pytest: "6"
92+
tox_env: "py37-pytest6"
93+
94+
steps:
95+
- uses: actions/checkout@v3
96+
97+
- name: Download Package
98+
uses: actions/download-artifact@v3
99+
with:
100+
name: Packages
101+
path: dist
102+
103+
- name: Set up Python
104+
uses: actions/setup-python@v4
105+
with:
106+
python-version: "3.7"
107+
108+
- name: Install tox
109+
run: |
110+
python -m pip install --upgrade pip
111+
pip install tox
112+
113+
- name: Test
114+
shell: bash
115+
run: tox run -e ${{ matrix.tox_env }}

CHANGES.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Release Notes
22
-------------
33

4+
**0.9.3dev (unreleased)**
5+
6+
* Add tox and CI testing on Python 3.12
7+
* Add legacy pytest versions to CI.
8+
* Now testing pytest 4, 5, 6
9+
* Non-legacy testing uses latest pytest, which is pytest 7
10+
411
**0.9.2 (2023-Oct-1)**
512

613
* Migrate CI to GitHub Actions

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@
3232
'Programming Language :: Python :: 3.9',
3333
'Programming Language :: Python :: 3.10',
3434
'Programming Language :: Python :: 3.11',
35+
'Programming Language :: Python :: 3.12',
3536
])

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
minversion = 3.4.0
88
isolated_build = true
99
envlist =
10-
py{37,38,39,310,311,py3}-pytest7
10+
py{37,38,39,310,311,312,py3}-pytest7
1111
py37-pytest{4,5,6}
1212
flake8
1313

@@ -20,6 +20,6 @@ deps =
2020
pytest7: pytest>=7
2121

2222
[testenv:flake8]
23-
basepython = python
23+
basepython = py311
2424
deps = flake8
2525
commands = flake8 {posargs:pytest_repeat.py test_repeat.py}

0 commit comments

Comments
 (0)