Skip to content

Commit

Permalink
feat: update to pybind11 2.6.0b1
Browse files Browse the repository at this point in the history
  • Loading branch information
henryiii committed Sep 30, 2020
1 parent 435a2b6 commit 5c8fb37
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 5c8fb37

Please sign in to comment.