Skip to content

Commit 499fcd5

Browse files
authored
ci: drop pypy2 linux, PGI 20.7, add Python 10 dev (#2724)
* ci: drop pypy2 linux, add Python 10 dev * ci: fix mistake * ci: commented-out PGI 20.11, drop 20.7
1 parent 5469c23 commit 499fcd5

File tree

2 files changed

+50
-54
lines changed

2 files changed

+50
-54
lines changed

.github/workflows/ci.yml

Lines changed: 48 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@ jobs:
2121
- 2.7
2222
- 3.5
2323
- 3.6
24-
- 3.7
25-
- 3.8
2624
- 3.9
27-
# - 3.10.0-alpha.1 - need next release for pybind11 fix
25+
- 3.10-dev
2826
- pypy2
2927
- pypy3
3028

@@ -44,10 +42,6 @@ jobs:
4442
python: 3.6
4543
args: >
4644
-DPYBIND11_FINDPYTHON=ON
47-
- runs-on: ubuntu-latest
48-
python: 3.8
49-
args: >
50-
-DPYBIND11_FINDPYTHON=ON
5145
5246
# These items will be removed from the build matrix, keys must match.
5347
exclude:
@@ -57,11 +51,9 @@ jobs:
5751
- runs-on: windows-latest
5852
python: pypy3
5953

60-
# Let's drop a few macOS runs since that tends to be 2.7 or 3.8+
61-
- runs-on: macos-latest
62-
python: 3.6
63-
- runs-on: macos-latest
64-
python: 3.7
54+
# TODO: PyPy2 7.3.3 segfaults, while 7.3.2 was fine.
55+
- runs-on: ubuntu-latest
56+
python: pypy2
6557

6658
name: "🐍 ${{ matrix.python }} • ${{ matrix.runs-on }} • x64 ${{ matrix.args }}"
6759
runs-on: ${{ matrix.runs-on }}
@@ -117,7 +109,7 @@ jobs:
117109

118110
- name: C++11 tests
119111
# TODO: Figure out how to load the DLL on Python 3.8+
120-
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9))"
112+
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10-dev'))"
121113
run: cmake --build . --target cpptest -j 2
122114

123115
- name: Interface test C++11
@@ -145,7 +137,7 @@ jobs:
145137

146138
- name: C++ tests
147139
# TODO: Figure out how to load the DLL on Python 3.8+
148-
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9))"
140+
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10-dev'))"
149141
run: cmake --build build2 --target cpptest
150142

151143
- name: Interface test
@@ -250,44 +242,48 @@ jobs:
250242
run: cmake --build build --target pytest
251243

252244

253-
# Testing CentOS 8 + PGI compilers
254-
centos-nvhpc8:
255-
runs-on: ubuntu-latest
256-
name: "🐍 3 • CentOS8 / PGI 20.7 • x64"
257-
container: centos:8
258-
259-
steps:
260-
- uses: actions/checkout@v2
261-
262-
- name: Add Python 3 and a few requirements
263-
run: yum update -y && yum install -y git python3-devel python3-numpy python3-pytest make environment-modules
264-
265-
- name: Install CMake with pip
266-
run: |
267-
python3 -m pip install --upgrade pip
268-
python3 -m pip install cmake --prefer-binary
269-
270-
- name: Install NVidia HPC SDK
271-
run: yum -y install https://developer.download.nvidia.com/hpc-sdk/nvhpc-20-7-20.7-1.x86_64.rpm https://developer.download.nvidia.com/hpc-sdk/nvhpc-2020-20.7-1.x86_64.rpm
272-
273-
- name: Configure
274-
shell: bash
275-
run: |
276-
source /etc/profile.d/modules.sh
277-
module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/20.7
278-
cmake -S . -B build -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_STANDARD=14 -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
279-
280-
- name: Build
281-
run: cmake --build build -j 2 --verbose
282-
283-
- name: Python tests
284-
run: cmake --build build --target pytest
285-
286-
- name: C++ tests
287-
run: cmake --build build --target cpptest
288-
289-
- name: Interface test
290-
run: cmake --build build --target test_cmake_build
245+
# TODO: Internal compiler error - report to NVidia
246+
# # Testing CentOS 8 + PGI compilers
247+
# centos-nvhpc8:
248+
# runs-on: ubuntu-latest
249+
# name: "🐍 3 • CentOS8 / PGI 20.11 • x64"
250+
# container: centos:8
251+
#
252+
# steps:
253+
# - uses: actions/checkout@v2
254+
#
255+
# - name: Add Python 3 and a few requirements
256+
# run: yum update -y && yum install -y git python3-devel python3-numpy python3-pytest make environment-modules
257+
#
258+
# - name: Install CMake with pip
259+
# run: |
260+
# python3 -m pip install --upgrade pip
261+
# python3 -m pip install cmake --prefer-binary
262+
#
263+
# - name: Install NVidia HPC SDK
264+
# run: >
265+
# yum -y install
266+
# https://developer.download.nvidia.com/hpc-sdk/20.11/nvhpc-20-11-20.11-1.x86_64.rpm
267+
# https://developer.download.nvidia.com/hpc-sdk/20.11/nvhpc-2020-20.11-1.x86_64.rpm
268+
#
269+
# - name: Configure
270+
# shell: bash
271+
# run: |
272+
# source /etc/profile.d/modules.sh
273+
# module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/20.11
274+
# cmake -S . -B build -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_STANDARD=14 -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
275+
#
276+
# - name: Build
277+
# run: cmake --build build -j 2 --verbose
278+
#
279+
# - name: Python tests
280+
# run: cmake --build build --target pytest
281+
#
282+
# - name: C++ tests
283+
# run: cmake --build build --target cpptest
284+
#
285+
# - name: Interface test
286+
# run: cmake --build build --target test_cmake_build
291287

292288

293289
# Testing on CentOS 7 + PGI compilers, which seems to require more workarounds

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ Supported compilers
135135
3. Microsoft Visual Studio 2015 Update 3 or newer
136136
4. Intel C++ compiler 18 or newer
137137
(`possible issue <https://github.com/pybind/pybind11/pull/2573>`_ on 20.2)
138-
5. Cygwin/GCC (tested on 2.5.1)
138+
5. Cygwin/GCC (previously tested on 2.5.1)
139139
6. NVCC (CUDA 11.0 tested)
140-
7. NVIDIA PGI (20.7 and 20.9 tested)
140+
7. NVIDIA PGI (20.9 tested)
141141

142142
About
143143
-----

0 commit comments

Comments
 (0)