Skip to content

Commit 0e43fcc

Browse files
rwgkhenryiii
andauthored
Python 3.12b2 testing (#4695)
* Uncomment `Interface test` sections (test_embed) * fix: setuptools has been removed from default installs in 3.12 --------- Co-authored-by: Henry Schreiner <[email protected]>
1 parent c679a92 commit 0e43fcc

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,9 @@ jobs:
180180
# This makes sure the setup_helpers module can build packages using
181181
# setuptools
182182
- name: Setuptools helpers test
183-
run: pytest tests/extra_setuptools
183+
run: |
184+
pip install setuptools
185+
pytest tests/extra_setuptools
184186
if: "!(matrix.runs-on == 'windows-2022')"
185187

186188

@@ -242,8 +244,6 @@ jobs:
242244
python -m pip install -r tests/requirements.txt
243245
244246
- name: Configure
245-
env:
246-
SETUPTOOLS_USE_DISTUTILS: stdlib
247247
run: >
248248
cmake -S . -B build
249249
-DCMAKE_BUILD_TYPE=Debug

.github/workflows/upstream.yml

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
name: Upstream
32

43
on:
@@ -65,8 +64,8 @@ jobs:
6564
- name: Python tests C++11
6665
run: cmake --build build11 --target pytest -j 2
6766

68-
# - name: C++11 tests
69-
# run: cmake --build build11 --target cpptest -j 2
67+
- name: C++11 tests
68+
run: cmake --build build11 --target cpptest -j 2
7069

7170
- name: Interface test C++11
7271
run: cmake --build build11 --target test_cmake_build
@@ -80,14 +79,14 @@ jobs:
8079
-DDOWNLOAD_EIGEN=ON
8180
-DCMAKE_CXX_STANDARD=17
8281
83-
- name: Build
82+
- name: Build C++17
8483
run: cmake --build build17 -j 2
8584

86-
- name: Python tests
85+
- name: Python tests C++17
8786
run: cmake --build build17 --target pytest
8887

89-
# - name: C++ tests
90-
# run: cmake --build build17 --target cpptest
88+
- name: C++17 tests
89+
run: cmake --build build17 --target cpptest
9190

9291
# Third build - C++17 mode with unstable ABI
9392
- name: Configure (unstable ABI)
@@ -105,10 +104,12 @@ jobs:
105104
- name: Python tests (unstable ABI)
106105
run: cmake --build build17max --target pytest
107106

108-
- name: Interface test
107+
- name: Interface test (unstable ABI)
109108
run: cmake --build build17max --target test_cmake_build
110109

111110
# This makes sure the setup_helpers module can build packages using
112111
# setuptools
113112
- name: Setuptools helpers test
114-
run: pytest tests/extra_setuptools
113+
run: |
114+
pip install setuptools
115+
pytest tests/extra_setuptools

0 commit comments

Comments
 (0)