From 9fb3bf9d16ade870bf82d678adfb82a0153cf87c Mon Sep 17 00:00:00 2001
From: Henry Schreiner <henryschreineriii@gmail.com>
Date: Wed, 30 Sep 2020 18:17:10 -0400
Subject: [PATCH] feat: update to pybind11 2.6.0b1

---
 .github/workflows/conda.yml  |  2 +-
 .github/workflows/wheels.yml | 14 +++++++-------
 conda.recipe/meta.yaml       |  2 +-
 setup.py                     |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index ca58687..35adfb6 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest] # add after 2.6.0: windows-latest, macos-latest
+        platform: [ubuntu-latest, windows-latest, macos-latest]
         python-version: ["3.6", "3.8"]
 
     runs-on: ${{ matrix.platform }}
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 0d19deb..ead9f2a 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -12,8 +12,8 @@ on:
 
 env:
   CIBW_TEST_COMMAND: python {project}/tests/test.py
-  # This is a hack that can be removed when we start using wheels for pybind11
-  CIBW_BEFORE_BUILD: pip install cmake git+https://github.com/pybind/pybind11.git@master
+  # This can be removed if pyproject.toml is used
+  CIBW_BEFORE_BUILD: pip install pybind11
 
 
 jobs:
@@ -52,14 +52,14 @@ jobs:
     - uses: actions/setup-python@v2
 
     - name: Install cibuildwheel
-      run: python -m pip install cibuildwheel==1.6.0
+      run: python -m pip install cibuildwheel==1.6.1
 
     - name: Build wheel
       run: python -m cibuildwheel --output-dir wheelhouse
       env:
-        # We have to skip Win 3.5 for now, because it doesn't support PEP 518
-        # build from a portable install (can re-add when using wheels for pybind11)
-        CIBW_SKIP: cp27-win* cp35-win*
+        # Python 2.7 on Windows requires a workaround for C++11 support,
+        # built separately below
+        CIBW_SKIP: cp27-win*
 
     - name: Show files
       run: ls -lh wheelhouse
@@ -88,7 +88,7 @@ jobs:
     - uses: actions/setup-python@v2
 
     - name: Install cibuildwheel
-      run: python -m pip install cibuildwheel==1.6.0
+      run: python -m pip install cibuildwheel==1.6.1
 
     - uses: ilammy/msvc-dev-cmd@v1
 
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
index 4b064df..28713a3 100644
--- a/conda.recipe/meta.yaml
+++ b/conda.recipe/meta.yaml
@@ -12,7 +12,7 @@ build:
     # And never do this yourself unless you know what you are doing (it
     # explicitly is okay with pybind11, but may not be with arbitrary
     # libraries)
-    python -m pip install -vvv "git+https://github.com/pybind/pybind11.git@master"
+    python -m pip install -vvv pybind11==2.6.0b1
     python -m pip install . -vvv --no-deps
     python -m pip uninstall -y pybind11
 
diff --git a/setup.py b/setup.py
index d707d22..8563a3c 100644
--- a/setup.py
+++ b/setup.py
@@ -41,8 +41,8 @@
     ext_modules=ext_modules,
     # Note: You have to add pybind11 to both setup and install requires to make
     # it available during the build. Using PEP 518's pyproject.toml is better!
-    setup_requires=["pybind11 @ git+https://github.com/pybind/pybind11.git@master"],
-    install_requires=["pybind11 @ git+https://github.com/pybind/pybind11.git@master"],
+    setup_requires=["pybind11==2.6.0b1"]
+    install_requires=["pybind11==2.6.0b1"]
     extras_require={"test": "pytest"},
     # Currently, build_ext only provides an optional "highest supported C++
     # level" feature, but in the future it may provide more features.