Skip to content

Commit 70dc7cc

Browse files
committed
Bump minimum Python version to 3.10 and update CI matrix, and try and fix conda build
1 parent de69b98 commit 70dc7cc

3 files changed

Lines changed: 16 additions & 22 deletions

File tree

.github/workflows/main.yml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,29 @@ jobs:
2121
2222
# Standard tests
2323
24-
- linux: py38-test-oldestdeps
25-
- linux: py39-test
26-
- linux: py310-test
24+
- linux: py310-test-oldestdeps
2725
- linux: py311-test
2826
- linux: py312-test
2927
- linux: py313-test
30-
- linux: py312-test-devdeps
28+
- linux: py313-test-devdeps
3129
32-
- macos: py312-test-devdeps
30+
- macos: py312-test
3331
posargs: --openmp-expected=False
34-
- macos: py313-test
32+
- macos: py313-test-devdeps
3533
posargs: --openmp-expected=False
3634
37-
- windows: py38-test
38-
runs-on: windows-2019
35+
- windows: py310-test
3936
- windows: py312-test-devdeps
40-
runs-on: windows-2019
4137
4238
# Test with more compilers, for the OpenMP helpers
43-
- macos: py311-test-osxclang-conda
39+
- macos: py313-test-osxclang-conda
4440
runs-on: macos-13
45-
toxdeps: 'tox>=4'
4641
coverage: ''
47-
- linux: py39-test-linuxgcc-conda
48-
toxdeps: 'tox>=4'
42+
- linux: py310-test-linuxgcc-conda
4943
coverage: ''
5044
5145
# Test downstream packages
52-
- linux: py312-downstream
46+
- linux: py313-downstream
5347
5448
publish:
5549
needs: tests

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ classifiers = [
1616
"Topic :: Software Development :: Libraries :: Python Modules",
1717
"Topic :: System :: Archiving :: Packaging",
1818
]
19-
requires-python = ">=3.8"
19+
requires-python = ">=3.10"
2020
dependencies = [
21-
"setuptools>=40.2",
21+
"setuptools>=64",
2222
"tomli>=1.0.0 ; python_version < '3.11'",
2323
]
2424
dynamic = ["version"]

tox.ini

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
envlist =
3-
py{38,39,310,311,312}-test{,-osxclang,-linuxgcc}{,-conda}{,-devdeps}
4-
py{38,39,310,311,312}-downstream
3+
py{310,311,312,313}-test{,-osxclang,-linuxgcc}{,-conda}{,-devdeps}
4+
py{310,311,312,313}-downstream
55
style
66

77
# conda jobs need this because it is pulling in tox 3, not 4
@@ -11,7 +11,7 @@ isolated_build = true
1111
passenv =
1212
CONDA_BUILD_SYSROOT,CI
1313
setenv =
14-
osxclang: CC=clang-10
14+
osxclang: CC=clang-20
1515
linuxgcc: CC=gcc_linux-64
1616
changedir =
1717
test: .tmp/{envname}
@@ -22,10 +22,10 @@ description =
2222
devdeps: run tests with developer versions of setuptools
2323
oldestdeps: run tests with oldest supported version of setuptools
2424
deps =
25-
oldestdeps: setuptools==42.0
25+
oldestdeps: setuptools==64
2626
devdeps: git+https://github.com/pypa/setuptools.git
2727
conda_deps =
28-
osxclang: clang_osx-64==10
28+
osxclang: clang-20
2929
osxclang: llvm-openmp
3030
linuxgcc: gcc_linux-64
3131
conda_channels =
@@ -37,7 +37,7 @@ commands =
3737
test: python -c 'import setuptools; print(setuptools.__version__)'
3838
test: pytest --pyargs extension_helpers {toxinidir}/docs --cov extension_helpers --cov-config={toxinidir}/pyproject.toml {posargs}
3939

40-
[testenv:py{38,39,310,311,312}-downstream]
40+
[testenv:py{310,311,312,313}-downstream]
4141
changedir = .tmp/downstream
4242
commands =
4343
pip install setuptools setuptools_scm wheel cython numpy

0 commit comments

Comments
 (0)