Skip to content

Commit 5552cbf

Browse files
authored
Add Python 3.10, 3.11, 3.12 to win32 job matrix. (#5179)
* Add Python 3.10, 3.11, 3.12 to win32 job matrix. * Quotes around Python version numbers (win32 job). * tests/requirements.txt: no scipy for Python >= 3.10 under win32 * Try running `cmake --build . --target cpptest` on all platforms (`standard` job).
1 parent 186df22 commit 5552cbf

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,7 @@ jobs:
133133
run: cmake --build . --target pytest -j 2
134134

135135
- name: C++11 tests
136-
# TODO: Figure out how to load the DLL on Python 3.8+
137-
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10' || matrix.python == '3.11' || matrix.python == 'pypy-3.8'))"
138-
run: cmake --build . --target cpptest -j 2
136+
run: cmake --build . --target cpptest -j 2
139137

140138
- name: Interface test C++11
141139
run: cmake --build . --target test_cmake_build
@@ -164,8 +162,6 @@ jobs:
164162
run: cmake --build build2 --target pytest
165163

166164
- name: C++ tests
167-
# TODO: Figure out how to load the DLL on Python 3.8+
168-
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10' || matrix.python == '3.11' || matrix.python == 'pypy-3.8'))"
169165
run: cmake --build build2 --target cpptest
170166

171167
# Third build - C++17 mode with unstable ABI
@@ -811,17 +807,26 @@ jobs:
811807
fail-fast: false
812808
matrix:
813809
python:
814-
- 3.6
815-
- 3.7
816-
- 3.8
817-
- 3.9
810+
- '3.6'
811+
- '3.7'
812+
- '3.8'
813+
- '3.9'
814+
- '3.10'
815+
- '3.11'
816+
- '3.12'
818817

819818
include:
820-
- python: 3.9
819+
- python: '3.12'
821820
args: -DCMAKE_CXX_STANDARD=20
822-
- python: 3.8
821+
- python: '3.11'
822+
args: -DCMAKE_CXX_STANDARD=20
823+
- python: '3.10'
824+
args: -DCMAKE_CXX_STANDARD=20
825+
- python: '3.9'
826+
args: -DCMAKE_CXX_STANDARD=20
827+
- python: '3.8'
823828
args: -DCMAKE_CXX_STANDARD=17
824-
- python: 3.7
829+
- python: '3.7'
825830
args: -DCMAKE_CXX_STANDARD=14
826831

827832

tests/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ numpy~=1.26.0; platform_python_implementation!="PyPy" and python_version>="3.11"
1111
pytest~=7.0
1212
pytest-timeout
1313
scipy~=1.5.4; platform_python_implementation!="PyPy" and python_version<"3.10"
14-
scipy~=1.8.0; platform_python_implementation!="PyPy" and python_version=="3.10"
15-
scipy~=1.11.1; platform_python_implementation!="PyPy" and python_version>="3.11" and python_version<"3.13"
14+
scipy~=1.8.0; platform_python_implementation!="PyPy" and python_version=="3.10" and sys_platform!='win32'
15+
scipy~=1.11.1; platform_python_implementation!="PyPy" and python_version>="3.11" and python_version<"3.13" and sys_platform!='win32'

0 commit comments

Comments
 (0)