Skip to content

Commit e215ded

Browse files
rwgkrwgk
committed
Tracking ci.yml changes from master.
1 parent 826f615 commit e215ded

File tree

2 files changed

+38
-26
lines changed

2 files changed

+38
-26
lines changed

‎.github/workflows/ci_sh_def.yml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,15 @@ jobs:
121121
run: python -m pip install pytest-github-actions-annotate-failures
122122

123123
# First build - C++11 mode and inplace
124-
# More-or-less randomly adding -DPYBIND11_SIMPLE_GIL_MANAGEMENT=ON here.
124+
# More-or-less randomly adding -DPYBIND11_SIMPLE_GIL_MANAGEMENT=ON here
125+
# (same for PYBIND11_NUMPY_1_ONLY, but requires a NumPy 1.x at runtime).
125126
- name: Configure C++11 ${{ matrix.args }}
126127
run: >
127128
cmake -S . -B .
128129
-DPYBIND11_WERROR=ON
130+
-DPYBIND11_DISABLE_HANDLE_TYPE_NAME_DEFAULT_IMPLEMENTATION=ON
129131
-DPYBIND11_SIMPLE_GIL_MANAGEMENT=ON
132+
-DPYBIND11_NUMPY_1_ONLY=ON
130133
-DDOWNLOAD_CATCH=ON
131134
-DDOWNLOAD_EIGEN=ON
132135
-DCMAKE_CXX_STANDARD=11
@@ -152,11 +155,13 @@ jobs:
152155

153156
# Second build - C++17 mode and in a build directory
154157
# More-or-less randomly adding -DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF here.
158+
# (same for PYBIND11_NUMPY_1_ONLY, but requires a NumPy 1.x at runtime).
155159
- name: Configure C++17
156160
run: >
157161
cmake -S . -B build2
158162
-DPYBIND11_WERROR=ON
159163
-DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF
164+
-DPYBIND11_NUMPY_1_ONLY=ON
160165
-DDOWNLOAD_CATCH=ON
161166
-DDOWNLOAD_EIGEN=ON
162167
-DCMAKE_CXX_STANDARD=17
@@ -682,6 +687,11 @@ jobs:
682687
run: |
683688
python3 -m pip install cmake -r tests/requirements.txt
684689
690+
- name: Ensure NumPy 2 is used (required Python >= 3.9)
691+
if: matrix.container == 'almalinux:9'
692+
run: |
693+
python3 -m pip install 'numpy>=2.0.0b1' 'scipy>=1.13.0rc1'
694+
685695
- name: Configure
686696
shell: bash
687697
run: >
@@ -921,8 +931,10 @@ jobs:
921931
python-version: ${{ matrix.python }}
922932

923933
- name: Prepare env
934+
# Ensure use of NumPy 2 (via NumPy nightlies but can be changed soon)
924935
run: |
925936
python3 -m pip install -r tests/requirements.txt
937+
python3 -m pip install 'numpy>=2.0.0b1' 'scipy>=1.13.0rc1'
926938
927939
- name: Update CMake
928940
uses: jwlawson/actions-setup-cmake@v2.0

‎.github/workflows/ci_sh_def.yml.patch‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ci.yml 2024-02-20 12:29:08.800226093 -0800
2-
+++ ci_sh_def.yml 2024-02-20 12:29:39.408187912 -0800
1+
--- ci.yml 2024-03-27 17:06:50.362431921 -0700
2+
+++ ci_sh_def.yml 2024-03-27 17:07:41.890376614 -0700
33
@@ -1,4 +1,16 @@
44
-name: CI
55
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@@ -27,47 +27,47 @@
2727
cancel-in-progress: true
2828

2929
env:
30-
@@ -118,6 +130,7 @@
30+
@@ -121,6 +133,7 @@
3131
-DDOWNLOAD_CATCH=ON
3232
-DDOWNLOAD_EIGEN=ON
3333
-DCMAKE_CXX_STANDARD=11
3434
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
3535
${{ matrix.args }}
3636

3737
- name: Build C++11
38-
@@ -147,6 +160,7 @@
38+
@@ -152,6 +165,7 @@
3939
-DDOWNLOAD_CATCH=ON
4040
-DDOWNLOAD_EIGEN=ON
4141
-DCMAKE_CXX_STANDARD=17
4242
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
4343
${{ matrix.args }}
4444

4545
- name: Build
46-
@@ -168,6 +182,7 @@
46+
@@ -173,6 +187,7 @@
4747
-DDOWNLOAD_CATCH=ON
4848
-DDOWNLOAD_EIGEN=ON
4949
-DCMAKE_CXX_STANDARD=17
5050
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
5151
-DPYBIND11_INTERNALS_VERSION=10000000
5252
${{ matrix.args }}
5353

54-
@@ -255,6 +270,7 @@
54+
@@ -260,6 +275,7 @@
5555
-DDOWNLOAD_CATCH=ON
5656
-DDOWNLOAD_EIGEN=ON
5757
-DCMAKE_CXX_STANDARD=17
5858
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
5959

6060
- name: Build
6161
run: cmake --build build -j 2
62-
@@ -323,6 +339,7 @@
62+
@@ -328,6 +344,7 @@
6363
-DPYBIND11_WERROR=ON
6464
-DDOWNLOAD_CATCH=ON
6565
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
6666
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
6767
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
6868

6969
- name: Build
70-
@@ -352,7 +369,7 @@
70+
@@ -357,7 +374,7 @@
7171
run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy
7272

7373
- name: Configure
@@ -76,7 +76,7 @@
7676

7777
- name: Build
7878
run: cmake --build build -j2 --verbose
79-
@@ -440,7 +457,7 @@
79+
@@ -445,7 +462,7 @@
8080
cmake -S . -B build -DDOWNLOAD_CATCH=ON \
8181
-DCMAKE_CXX_STANDARD=17 \
8282
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
@@ -85,127 +85,127 @@
8585
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp"
8686

8787
- name: Build
88-
@@ -494,6 +511,7 @@
88+
@@ -499,6 +516,7 @@
8989
-DPYBIND11_WERROR=ON
9090
-DDOWNLOAD_CATCH=ON
9191
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
9292
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
9393
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
9494

9595
- name: Build
96-
@@ -516,6 +534,7 @@
96+
@@ -521,6 +539,7 @@
9797
-DPYBIND11_WERROR=ON
9898
-DDOWNLOAD_CATCH=ON
9999
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
100100
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
101101
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
102102
"-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
103103

104-
@@ -565,6 +584,7 @@
104+
@@ -570,6 +589,7 @@
105105
-DDOWNLOAD_CATCH=ON \
106106
-DDOWNLOAD_EIGEN=OFF \
107107
-DCMAKE_CXX_STANDARD=11 \
108108
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
109109
-DCMAKE_CXX_COMPILER=$(which icpc) \
110110
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
111111

112-
@@ -597,6 +617,7 @@
112+
@@ -602,6 +622,7 @@
113113
-DDOWNLOAD_CATCH=ON \
114114
-DDOWNLOAD_EIGEN=OFF \
115115
-DCMAKE_CXX_STANDARD=17 \
116116
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
117117
-DCMAKE_CXX_COMPILER=$(which icpc) \
118118
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
119119

120-
@@ -670,6 +691,7 @@
120+
@@ -680,6 +701,7 @@
121121
-DDOWNLOAD_CATCH=ON
122122
-DDOWNLOAD_EIGEN=ON
123123
-DCMAKE_CXX_STANDARD=11
124124
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
125125
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
126126

127127
- name: Build
128-
@@ -720,6 +742,7 @@
128+
@@ -730,6 +752,7 @@
129129
cmake ../pybind11-tests
130130
-DDOWNLOAD_CATCH=ON
131131
-DPYBIND11_WERROR=ON
132132
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
133133
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
134134
working-directory: /build-tests
135135

136-
@@ -815,6 +838,7 @@
136+
@@ -825,6 +848,7 @@
137137
-DPYBIND11_WERROR=ON
138138
-DDOWNLOAD_CATCH=ON
139139
-DDOWNLOAD_EIGEN=ON
140140
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
141141
${{ matrix.args }}
142142
- name: Build C++11
143143
run: cmake --build build -j 2
144-
@@ -869,6 +893,7 @@
144+
@@ -879,6 +903,7 @@
145145
-DPYBIND11_WERROR=ON
146146
-DDOWNLOAD_CATCH=ON
147147
-DDOWNLOAD_EIGEN=ON
148148
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
149149
${{ matrix.args }}
150150
- name: Build C++11
151151
run: cmake --build build --config Debug -j 2
152-
@@ -909,6 +934,7 @@
152+
@@ -921,6 +946,7 @@
153153
-DDOWNLOAD_CATCH=ON
154154
-DDOWNLOAD_EIGEN=ON
155155
-DCMAKE_CXX_STANDARD=20
156156
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
157157

158158
- name: Build C++20
159159
run: cmake --build build -j 2
160-
@@ -929,6 +955,7 @@
160+
@@ -941,6 +967,7 @@
161161
-DDOWNLOAD_CATCH=ON
162162
-DDOWNLOAD_EIGEN=ON
163163
-DCMAKE_CXX_STANDARD=20
164164
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
165165
"-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
166166

167167
- name: Build C++20 - Exercise cmake -DPYBIND11_TEST_OVERRIDE
168-
@@ -981,6 +1008,7 @@
168+
@@ -993,6 +1020,7 @@
169169
run: >-
170170
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
171171
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
172172
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
173173
-S . -B build
174174

175175
- name: Build C++11
176-
@@ -1002,6 +1030,7 @@
176+
@@ -1014,6 +1042,7 @@
177177
run: >-
178178
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
179179
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
180180
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
181181
-S . -B build2
182182

183183
- name: Build C++14
184-
@@ -1023,6 +1052,7 @@
184+
@@ -1035,6 +1064,7 @@
185185
run: >-
186186
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
187187
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
188188
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
189189
-S . -B build3
190190

191191
- name: Build C++17
192-
@@ -1090,6 +1120,7 @@
192+
@@ -1102,6 +1132,7 @@
193193
-DDOWNLOAD_EIGEN=ON
194194
-DCMAKE_CXX_COMPILER=clang++
195195
-DCMAKE_CXX_STANDARD=17
196196
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
197197

198198
- name: Build
199199
run: cmake --build . -j 2
200-
@@ -1155,6 +1186,7 @@
200+
@@ -1167,6 +1198,7 @@
201201
-DDOWNLOAD_EIGEN=ON
202202
-DCMAKE_CXX_COMPILER=clang++
203203
-DCMAKE_CXX_STANDARD=17
204204
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
205205
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
206206

207207
- name: Build
208-
@@ -1178,6 +1210,7 @@
208+
@@ -1190,6 +1222,7 @@
209209
-DDOWNLOAD_EIGEN=ON
210210
-DCMAKE_CXX_COMPILER=clang++
211211
-DCMAKE_CXX_STANDARD=17

0 commit comments

Comments
 (0)