Skip to content

Commit

Permalink
Python 3.12 compat, add setuptools as explicit requirement in tox and…
Browse files Browse the repository at this point in the history
… add 3.12 builds and tests to GH workflows
  • Loading branch information
tobgu committed Oct 15, 2023
1 parent d264734 commit b091106
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 24 deletions.
22 changes: 1 addition & 21 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
python: [37, 38, 39, 310, 311]
python: [38, 39, 310, 311, 312]
bitness: [32, 64]
include:
# Run 32 and 64 bit version in parallel for Linux and Windows
Expand All @@ -43,26 +43,6 @@ jobs:
platform_id: manylinux_aarch64
- os: macos-latest
bitness: 64
platform_id: macosx_x86_64
- os: macos-latest
bitness: 64
platform_id: macosx_universal2
# Python 3.7 does not have universal2 wheel support yet
- os: macos-latest
python: 37
platform_id: macosx_x86_64
# Python 3.8 and onwards only need universal2 wheels
- os: macos-latest
python: 38
platform_id: macosx_universal2
- os: macos-latest
python: 39
platform_id: macosx_universal2
- os: macos-latest
python: 310
platform_id: macosx_universal2
- os: macos-latest
python: 311
platform_id: macosx_universal2
exclude:
- os: macos-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.7", "3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3
Expand Down
8 changes: 6 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,21 @@
# and then run "tox" from this directory.

[tox]
envlist = py{37,38,39,310,311,py3},memorytest38,doctest38,coverage-py38
envlist = py{38,39,310,311,312,py3},memorytest38,doctest38,coverage-py38

[gh-actions]
python =
3.7: py37
3.9: py39
3.10: py310
3.11: py311
3.12: py312

# Skipping 3.8 under GH actions for now. Need to fix coverage first.

[testenv]
commands = python {toxinidir}/setup.py test
deps =
setuptools

# Specifying the following tests like this is very non-DRY but I have no better solution right now.
[testenv:coverage-py38]
Expand All @@ -26,6 +28,7 @@ passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
setenv =
PYRSISTENT_NO_C_EXTENSION = 1
deps =
setuptools
pytest
hypothesis
pytest-cov
Expand All @@ -38,6 +41,7 @@ commands =
[testenv:memorytest38]
basepython = python3.8
deps =
setuptools
pytest
memory_profiler
psutil
Expand Down

0 comments on commit b091106

Please sign in to comment.