Skip to content

Commit 91e81b0

Browse files
rwgkrwgk
committed
Re-enabling Python 3.10-dev jobs, made possible by PR #2967. Pushing directly because this just affects the CI config.
1 parent 7d093a1 commit 91e81b0

File tree

3 files changed

+21
-25
lines changed

3 files changed

+21
-25
lines changed

‎.github/workflows/ci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ jobs:
2323
- 3.5
2424
- 3.6
2525
- 3.9
26-
# Broken b/o https://github.com/pytest-dev/pytest/issues/8539
27-
# - 3.10-dev
26+
- 3.10-dev
2827
- pypy2
2928
- pypy3
3029

@@ -175,9 +174,8 @@ jobs:
175174
- python-version: 3.9
176175
python-debug: true
177176
valgrind: true
178-
# Broken b/o https://github.com/pytest-dev/pytest/issues/8539
179-
# - python-version: 3.10-dev
180-
# python-debug: false
177+
- python-version: 3.10-dev
178+
python-debug: false
181179

182180
name: "🐍 ${{ matrix.python-version }}${{ matrix.python-debug && '-dbg' || '' }} (deadsnakes)${{ matrix.valgrind && ' • Valgrind' || '' }} • x64"
183181
runs-on: ubuntu-latest

‎.github/workflows/ci_sh_def.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ jobs:
3434
- 3.5
3535
- 3.6
3636
- 3.9
37-
# Broken b/o https://github.com/pytest-dev/pytest/issues/8539
38-
# - 3.10-dev
37+
- 3.10-dev
3938
- pypy2
4039
- pypy3
4140

@@ -188,9 +187,8 @@ jobs:
188187
- python-version: 3.9
189188
python-debug: true
190189
valgrind: true
191-
# Broken b/o https://github.com/pytest-dev/pytest/issues/8539
192-
# - python-version: 3.10-dev
193-
# python-debug: false
190+
- python-version: 3.10-dev
191+
python-debug: false
194192

195193
name: "🐍 ${{ matrix.python-version }}${{ matrix.python-debug && '-dbg' || '' }} (deadsnakes)${{ matrix.valgrind && ' • Valgrind' || '' }} • x64"
196194
runs-on: ubuntu-latest

‎.github/workflows/ci_sh_def.yml.patch

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ci.yml 2021-04-20 13:41:16.539965452 -0700
2-
+++ ci_sh_def.yml 2021-04-20 13:44:02.766796637 -0700
1+
--- ci.yml 2021-04-21 12:38:06.075756040 -0700
2+
+++ ci_sh_def.yml 2021-04-21 12:38:47.155420465 -0700
33
@@ -1,4 +1,15 @@
44
-name: CI-SH-AVL
55
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@@ -17,31 +17,31 @@
1717

1818
on:
1919
workflow_dispatch:
20-
@@ -101,6 +112,7 @@
20+
@@ -100,6 +111,7 @@
2121
-DDOWNLOAD_CATCH=ON
2222
-DDOWNLOAD_EIGEN=ON
2323
-DCMAKE_CXX_STANDARD=11
2424
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
2525
${{ matrix.args }}
2626

2727
- name: Build C++11
28-
@@ -128,6 +140,7 @@
28+
@@ -127,6 +139,7 @@
2929
-DDOWNLOAD_CATCH=ON
3030
-DDOWNLOAD_EIGEN=ON
3131
-DCMAKE_CXX_STANDARD=17
3232
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
3333
${{ matrix.args }}
3434
${{ matrix.args2 }}
3535

36-
@@ -285,6 +298,7 @@
36+
@@ -283,6 +296,7 @@
3737
-DPYBIND11_WERROR=ON
3838
-DDOWNLOAD_CATCH=ON
3939
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
4040
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
4141
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
4242

4343
- name: Build
44-
@@ -314,7 +328,8 @@
44+
@@ -312,7 +326,8 @@
4545
run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy
4646

4747
- name: Configure
@@ -51,7 +51,7 @@
5151

5252
- name: Build
5353
run: cmake --build build -j2 --verbose
54-
@@ -394,7 +409,7 @@
54+
@@ -392,7 +407,7 @@
5555
cmake3 -S . -B build -DDOWNLOAD_CATCH=ON \
5656
-DCMAKE_CXX_STANDARD=11 \
5757
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
@@ -60,63 +60,63 @@
6060
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp;test_virtual_functions.cpp"
6161

6262
# Building before installing Pip should produce a warning but not an error
63-
@@ -453,6 +468,7 @@
63+
@@ -451,6 +466,7 @@
6464
-DPYBIND11_WERROR=ON
6565
-DDOWNLOAD_CATCH=ON
6666
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
6767
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
6868
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
6969

7070
- name: Build
71-
@@ -508,6 +524,7 @@
71+
@@ -506,6 +522,7 @@
7272
-DDOWNLOAD_CATCH=ON \
7373
-DDOWNLOAD_EIGEN=OFF \
7474
-DCMAKE_CXX_STANDARD=11 \
7575
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
7676
-DCMAKE_CXX_COMPILER=$(which icpc) \
7777
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
7878

79-
@@ -540,6 +557,7 @@
79+
@@ -538,6 +555,7 @@
8080
-DDOWNLOAD_CATCH=ON \
8181
-DDOWNLOAD_EIGEN=OFF \
8282
-DCMAKE_CXX_STANDARD=17 \
8383
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
8484
-DCMAKE_CXX_COMPILER=$(which icpc) \
8585
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
8686

87-
@@ -599,6 +617,7 @@
87+
@@ -597,6 +615,7 @@
8888
-DDOWNLOAD_CATCH=ON
8989
-DDOWNLOAD_EIGEN=ON
9090
-DCMAKE_CXX_STANDARD=11
9191
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
9292
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
9393

9494
- name: Build
95-
@@ -649,6 +668,7 @@
95+
@@ -647,6 +666,7 @@
9696
cmake ../pybind11-tests
9797
-DDOWNLOAD_CATCH=ON
9898
-DPYBIND11_WERROR=ON
9999
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
100100
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
101101
working-directory: /build-tests
102102

103-
@@ -744,6 +764,7 @@
103+
@@ -742,6 +762,7 @@
104104
-DPYBIND11_WERROR=ON
105105
-DDOWNLOAD_CATCH=ON
106106
-DDOWNLOAD_EIGEN=ON
107107
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
108108
${{ matrix.args }}
109109
- name: Build C++11
110110
run: cmake --build build -j 2
111-
@@ -790,6 +811,7 @@
111+
@@ -788,6 +809,7 @@
112112
-DPYBIND11_WERROR=ON
113113
-DDOWNLOAD_CATCH=ON
114114
-DDOWNLOAD_EIGEN=ON
115115
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
116116

117117
- name: Build C++14
118118
run: cmake --build build -j 2
119-
@@ -810,12 +832,13 @@
119+
@@ -808,12 +830,13 @@
120120
- 3.7
121121
std:
122122
- 14

0 commit comments

Comments
 (0)