Merge 'upstream/master' (37f845a1d)

.appveyor.yml

@@ -21,9 +21,9 @@ install:
     python -W ignore -m pip install --upgrade pip wheel
     python -W ignore -m pip install pytest numpy --no-warn-script-location
 - ps: |
-    Start-FileDownload 'http://bitbucket.org/eigen/eigen/get/3.3.3.zip'
-    7z x 3.3.3.zip -y > $null
-    $env:CMAKE_INCLUDE_PATH = "eigen-eigen-67e894c6cd8f;$env:CMAKE_INCLUDE_PATH"
+    Start-FileDownload 'https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.zip'
+    7z x eigen-3.3.7.zip -y > $null
+    $env:CMAKE_INCLUDE_PATH = "eigen-3.3.7;$env:CMAKE_INCLUDE_PATH"
 build_script:
 - cmake -G "%CMAKE_GENERATOR%" -A "%CMAKE_ARCH%"
     -DCMAKE_CXX_STANDARD=14

.github/workflows/ci.yml

@@ -15,59 +15,64 @@ jobs:
         # runs-on: [ubuntu-latest, windows-latest, macos-latest]
         runs-on: [ubuntu-latest, macos-latest]
         arch: [x64]
-        max-cxx-std: [17]
         python:
         # - 2.7
         # - 3.5
         - 3.7
         - 3.8
-        - 3.9-dev
         # - pypy2
         # - pypy3
 
         include:
           - runs-on: ubuntu-latest
             python: 3.6
             arch: x64
-            max-cxx-std: 17
-          - runs-on: macos-latest
-            python: 3.7
-            arch: x64
-            max-cxx-std: 17
+            args: >
+              -DPYBIND11_FINDPYTHON=ON
           # - runs-on: windows-2016
           #   python: 3.7
           #   arch: x86
-          #   max-cxx-std: 14
-
-        exclude:
-          #   # Currently 32bit only, and we build 64bit
+          #   args2: >
+          #     -DCMAKE_CXX_FLAGS="/permissive- /EHsc /GR"
           # - runs-on: windows-latest
-          #   python: pypy2
+          #   python: 3.6
           #   arch: x64
-          #   max-cxx-std: 17
+          #   args: >
+          #     -DPYBIND11_FINDPYTHON=ON
           # - runs-on: windows-latest
-          #   python: pypy3
+          #   python: 3.7
           #   arch: x64
-          #   max-cxx-std: 17
 
-            # Currently can't build due to warning, fixed in CPython > 3.9b5
+          - runs-on: ubuntu-latest
+            python: 3.9-dev
+            arch: x64
           - runs-on: macos-latest
             python: 3.9-dev
             arch: x64
-            max-cxx-std: 17
-
-          #   # Currently broken on embed_test
-          # - runs-on: windows-latest
-          #   python: 3.8
-          #   arch: x64
-          #   max-cxx-std: 17
-          # - runs-on: windows-latest
-          #   python: 3.9-dev
-          #   arch: x64
-          #   max-cxx-std: 17
-
-    name: "🐍 ${{ matrix.python }} • ${{ matrix.runs-on }} • ${{ matrix.arch }}"
+            args: >
+              -DPYBIND11_FINDPYTHON=ON
+
+        # exclude:
+        #     # Currently 32bit only, and we build 64bit
+        #   - runs-on: windows-latest
+        #     python: pypy2
+        #     arch: x64
+        #   - runs-on: windows-latest
+        #     python: pypy3
+        #     arch: x64
+
+        #     # Currently broken on embed_test
+        #   - runs-on: windows-latest
+        #     python: 3.8
+        #     arch: x64
+        #   - runs-on: windows-latest
+        #     python: 3.9-dev
+        #     arch: x64
+
+
+    name: "🐍 ${{ matrix.python }} • ${{ matrix.runs-on }} • ${{ matrix.arch }} ${{ matrix.args }}"
     runs-on: ${{ matrix.runs-on }}
+    continue-on-error: ${{ endsWith(matrix.python, 'dev') }}
 
     steps:
     - uses: actions/checkout@v2
@@ -78,8 +83,14 @@ jobs:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.arch }}
 
+    - name: Setup Boost (Windows / Linux latest)
+      run: echo "::set-env name=BOOST_ROOT::$BOOST_ROOT_1_72_0"
+
+    - name: Update CMake
+      uses: jwlawson/actions-setup-cmake@v1.3
+
     - name: Cache wheels
-      if: startsWith(runner.os, 'macOS')
+      if: runner.os == 'macOS'
       uses: actions/cache@v2
       with:
         # This path is specific to macOS - we really only need it for PyPy NumPy wheels
@@ -90,50 +101,56 @@ jobs:
         key: ${{ runner.os }}-pip-${{ matrix.python }}-${{ matrix.arch }}-${{ hashFiles('tests/requirements.txt') }}
 
     - name: Prepare env
-      run: python -m pip install -r tests/requirements.txt
+      run: python -m pip install -r tests/requirements.txt --prefer-binary
 
-    - name: Configure C++11
-      shell: bash
+    - name: Setup annotations
+      if: runner.os == 'Linux'
+      run: python -m pip install pytest-github-actions-annotate-failures
+
+    - name: Configure C++11 ${{ matrix.args }}
       run: >
-        cmake -S . -B build
+        cmake -S . -B .
         -DPYBIND11_WERROR=ON
         -DDOWNLOAD_CATCH=ON
         -DDOWNLOAD_EIGEN=ON
         -DCMAKE_CXX_STANDARD=11
-        -DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
+        ${{ matrix.args }}
 
     - name: Build C++11
-      run: cmake --build build -j 2
+      run: cmake --build . -j 2
 
     - name: Python tests C++11
-      run: cmake --build build --target pytest -j 2
+      run: cmake --build . --target pytest -j 2
 
     - name: C++11 tests
-      run: cmake --build build --target cpptest -j 2
+      run: cmake --build .  --target cpptest -j 2
 
     - name: Interface test C++11
-      run: cmake --build build --target test_cmake_build
+      run: cmake --build . --target test_cmake_build
 
-    - name: Configure C++${{ matrix.max-cxx-std }}
-      shell: bash
+    - name: Clean directory
+      run: git clean -fdx
+
+    - name: Configure ${{ matrix.args2 }}
       run: >
         cmake -S . -B build2
         -DPYBIND11_WERROR=ON
         -DDOWNLOAD_CATCH=ON
         -DDOWNLOAD_EIGEN=ON
-        -DCMAKE_CXX_STANDARD=${{ matrix.max-cxx-std }}
-        -DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
+        -DCMAKE_CXX_STANDARD=17
+        ${{ matrix.args }}
+        ${{ matrix.args2 }}
 
-    - name: Build C++${{ matrix.max-cxx-std }}
+    - name: Build
       run: cmake --build build2 -j 2
 
-    - name: Python tests C++${{ matrix.max-cxx-std }}
+    - name: Python tests
       run: cmake --build build2 --target pytest
 
-    - name: C++${{ matrix.max-cxx-std }} tests
+    - name: C++ tests
       run: cmake --build build2 --target cpptest
 
-    - name: Interface test C++${{ matrix.max-cxx-std }}
+    - name: Interface test
       run: cmake --build build2 --target test_cmake_build
 
   clang:
@@ -142,11 +159,11 @@ jobs:
       fail-fast: false
       matrix:
         clang:
-          # - 3.6
-          # - 3.7
-          # - 3.9
-          # - 5
-          # - 7
+          - 3.6
+          - 3.7
+          - 3.9
+          - 5
+          - 7
           - 9
           - dev
 
@@ -248,7 +265,7 @@ jobs:
   #     run: python3 -m pip install --upgrade pip
 
   #   - name: Install dependencies
-  #     run: python3 -m pip install cmake -r tests/requirements.txt
+  #     run: python3 -m pip install cmake -r tests/requirements.txt --prefer-binary
 
   #   - name: Configure
   #     shell: bash
@@ -283,10 +300,14 @@ jobs:
     - name: Install requirements
       run: |
         apt-get update
-        apt-get install -y git make cmake g++ libeigen3-dev python3-dev python3-pip python3-pytest
+        apt-get install -y git make cmake g++ libeigen3-dev python3-dev python3-pip
+        pip3 install "pytest==3.1.*"
 
     - name: Configure for install
-      run: cmake -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") -DPYBIND11_INSTALL=1 -DPYBIND11_TEST=0 .
+      run: >
+        cmake .
+        -DPYBIND11_INSTALL=1 -DPYBIND11_TEST=0
+        -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
 
     - name: Make and install
       run: make install
@@ -298,7 +319,11 @@ jobs:
       run: mkdir /build-tests
 
     - name: Configure tests
-      run: cmake -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") ../pybind11-tests -DPYBIND11_WERROR=ON
+      run: >
+        cmake ../pybind11-tests
+        -DDOWNLOAD_CATCH=ON
+        -DPYBIND11_WERROR=ON
+        -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
       working-directory: /build-tests
 
     - name: Run tests
@@ -314,14 +339,14 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Install requirements
+    - name: Install system requirements
       run: apk add doxygen python3-dev
 
     - name: Ensure pip
       run: python3 -m ensurepip
 
-    - name: Install python docs requirements
-      run: python3 -m pip install "sphinx<3" sphinx_rtd_theme breathe==4.13.1 pytest setuptools
+    - name: Install docs & setup requirements
+      run: python3 -m pip install -r docs/requirements.txt pytest setuptools
 
     - name: Build docs
       run: python3 -m sphinx -W -b html docs docs/.build

.github/workflows/configure.yml

@@ -1,4 +1,4 @@
-name: Configure
+name: Config
 
 on:
   workflow_dispatch:
@@ -14,65 +14,65 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python:
-        - 2.7
-        - 3.8
+        runs-on: [ubuntu-latest, macos-latest, windows-latest]
+        arch: [x64]
+        cmake: [3.18]
 
-    name: CMake ${{ matrix.cmake }} Python ${{ matrix.python }} on ubuntu
-    runs-on: ubuntu-latest
+        include:
+        - runs-on: ubuntu-latest
+          arch: x64
+          cmake: 3.4
+
+        - runs-on: macos-latest
+          arch: x64
+          cmake: 3.7
+
+        - runs-on: windows-2016
+          arch: x86
+          cmake: 3.8
+
+        - runs-on: windows-2016
+          arch: x86
+          cmake: 3.18
+
+    name: 🐍 3.7 • CMake ${{ matrix.cmake }} • ${{ matrix.runs-on }}
+    runs-on: ${{ matrix.runs-on }}
 
     steps:
     - uses: actions/checkout@v2
 
-    - name: Setup Python ${{ matrix.python }}
+    - name: Setup Python 3.7
       uses: actions/setup-python@v2
       with:
-        python-version: ${{ matrix.python }}
+        python-version: 3.7
+        architecture: ${{ matrix.arch }}
 
     - name: Prepare env
       run: python -m pip install -r tests/requirements.txt
 
-    - name: Make build directories
-      run: |
-        mkdir build3.7
-        mkdir build3.11
-        mkdir build3.18
-
-    - name: Setup CMake 3.7
+    - name: Setup CMake ${{ matrix.cmake }}
       uses: jwlawson/actions-setup-cmake@v1.3
       with:
-        cmake-version: 3.7
-
-    - name: Configure 3.7
-      working-directory: build3.7
-      run: >
-        cmake ..
-        -DPYBIND11_WERROR=ON
-        -DDOWNLOAD_CATCH=ON
-        -DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
+        cmake-version: ${{ matrix.cmake }}
 
-    - name: Setup CMake 3.11
-      uses: jwlawson/actions-setup-cmake@v1.3
-      with:
-        cmake-version: 3.11
+    - name: Make build directories
+      run: mkdir "build dir"
 
-    - name: Configure 3.11
-      working-directory: build3.11
+    - name: Configure
+      working-directory: build dir
+      shell: bash
       run: >
         cmake ..
         -DPYBIND11_WERROR=ON
         -DDOWNLOAD_CATCH=ON
         -DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
 
-    - name: Setup CMake 3.18
-      uses: jwlawson/actions-setup-cmake@v1.3
-      with:
-        cmake-version: 3.18
+    - name: Build
+      working-directory: build dir
+      if: github.event_name == 'workflow_dispatch'
+      run: cmake --build . --config Release
 
-    - name: Configure 3.18
-      working-directory: build3.18
-      run: >
-        cmake ..
-        -DPYBIND11_WERROR=ON
-        -DDOWNLOAD_CATCH=ON
-        -DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
+    - name: Test
+      working-directory: build dir
+      if: github.event_name == 'workflow_dispatch'
+      run: cmake --build . --config Release --target check

.gitignore

@@ -32,9 +32,10 @@ MANIFEST
 .*.swp
 .DS_Store
 /dist
-/build
+/*build*
 .cache/
 sosize-*.txt
 pybind11Config*.cmake
 pybind11Targets.cmake
 /*env*
+/.vscode