Skip to content

Commit

Permalink
add 3.11 (again) (#119)
Browse files Browse the repository at this point in the history
* add 3.11 (again)

* CIBW_PRERELEASE_PYTHONS: True

* try pybind11 submodule at v2.9.2

* pybind11 2.9.2 in cmake

* Revert "try pybind11 submodule at v2.9.2"

This reverts commit ad93af3.

* manylinux2014 for CPython 3.11 Intel

* pybind11>=2.10.0

* just call cibuildwheel ourselves
  • Loading branch information
altendky committed Aug 31, 2022
1 parent 815ce9a commit a8dd1f8
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 9 deletions.
28 changes: 23 additions & 5 deletions .github/workflows/build.yml
Expand Up @@ -43,16 +43,34 @@ jobs:
python:
- major-dot-minor: '3.7'
cibw-build: 'cp37-*'
manylinux:
arch: manylinux2014
intel: manylinux2010
matrix: '3.7'
- major-dot-minor: '3.8'
cibw-build: 'cp38-*'
manylinux:
arch: manylinux2014
intel: manylinux2010
matrix: '3.8'
- major-dot-minor: '3.9'
cibw-build: 'cp39-*'
manylinux:
arch: manylinux2014
intel: manylinux2010
matrix: '3.9'
- major-dot-minor: '3.10'
cibw-build: 'cp310-*'
manylinux:
arch: manylinux2014
intel: manylinux2010
matrix: '3.10'
- major-dot-minor: '3.11'
cibw-build: 'cp311-*'
manylinux:
arch: manylinux2014
intel: manylinux2014
matrix: '3.11'
arch:
- name: ARM
matrix: arm
Expand Down Expand Up @@ -116,17 +134,14 @@ jobs:
pip install pipx
- name: Build and test
uses: pypa/cibuildwheel@v2.7.0
with:
output-dir: dist
env:
CIBW_BUILD_VERBOSITY_MACOS: 0
CIBW_BUILD_VERBOSITY_LINUX: 0
CIBW_BUILD_VERBOSITY_WINDOWS: 0
CIBW_BUILD: ${{ matrix.python.cibw-build }}
CIBW_SKIP: '*-manylinux_i686 *-win32 *-musllinux_*'
CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010
CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.python.manylinux['arm'] }}
CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.python.manylinux['intel'] }}
CIBW_ENVIRONMENT_LINUX: "PATH=/project/cmake-3.17.3-Linux-`uname -m`/bin:$PATH BUILD_VDF_CLIENT=N"
CIBW_BEFORE_ALL_LINUX: >
yum -y install epel-release
Expand Down Expand Up @@ -174,6 +189,9 @@ jobs:
&& cp {wheel} {dest_dir}
CIBW_TEST_REQUIRES: pytest
CIBW_TEST_COMMAND: py.test -v {project}/tests
CIBW_PRERELEASE_PYTHONS: True
run:
pipx run --spec='cibuildwheel==2.9.0' cibuildwheel --output-dir dist 2>&1

- name: Upload artifacts
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.5.0", "pybind11"]
requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.5.0", "pybind11>=2.10.0"]
build-backend = "setuptools.build_meta"

[tool.setuptools_scm]
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -253,7 +253,7 @@ def build_extensions(self):
python_requires=">=3.7",
long_description=open("README.md").read(),
long_description_content_type="text/markdown",
build_requires=["pybind11"],
build_requires=["pybind11>=2.10.0"],
url="https://github.com/Chia-Network/chiavdf",
ext_modules=ext_modules,
cmdclass={"build_ext": BuildExt},
Expand All @@ -273,7 +273,7 @@ def build_extensions(self):
long_description=open("README.md").read(),
long_description_content_type="text/markdown",
url="https://github.com/Chia-Network/chiavdf",
setup_requires=["pybind11>=2.5.0"],
setup_requires=["pybind11>=2.10.0"],
ext_modules=[CMakeExtension("chiavdf", "src")],
cmdclass=dict(
build_ext=CMakeBuild, install_hook=install_hook, build_hook=build_hook
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Expand Up @@ -32,7 +32,7 @@ include(FetchContent)
FetchContent_Declare(
pybind11-src
GIT_REPOSITORY https://github.com/pybind/pybind11.git
GIT_TAG v2.6.2
GIT_TAG v2.10.0
)
FetchContent_MakeAvailable(pybind11-src)

Expand Down

0 comments on commit a8dd1f8

Please sign in to comment.