From d1efb86dc6837e4b1755fb1ebf23e3468a2f6459 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 22 Jun 2021 18:28:19 -0400 Subject: [PATCH 1/2] ci: use CIBW 2.0 config --- .github/workflows/tests.yml | 4 +--- .github/workflows/wheels.yml | 9 +++------ pyproject.toml | 6 ++++++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 341ce2712..40b07b10e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -90,11 +90,9 @@ jobs: with: submodules: true - - uses: pypa/cibuildwheel@v1.12.0 + - uses: pypa/cibuildwheel@v2.0.0a4 env: CIBW_BUILD: cp38-win_amd64 cp36-manylinux_i686 cp37-macosx_x86_64 - CIBW_TEST_EXTRAS: test - CIBW_TEST_COMMAND: pytest {project}/tests CIBW_BUILD_VERBOSITY: 1 - uses: actions/upload-artifact@v2 diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 2f879a237..a9bfcc881 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -20,9 +20,6 @@ on: env: SETUPTOOLS_SCM_PRETEND_VERSION: ${{ github.event.inputs.overrideVersion }} CIBW_ENVIRONMENT: "PIP_ONLY_BINARY=numpy SETUPTOOLS_SCM_PRETEND_VERSION=${{ github.event.inputs.overrideVersion }}" - CIBW_TEST_EXTRAS: test - CIBW_TEST_COMMAND: "pytest {project}/tests" - CIBW_TEST_SKIP: "pp*macos* pp*win* pp27-* *universal2:arm64" jobs: build_sdist: @@ -34,7 +31,7 @@ jobs: submodules: true - name: Build SDist - run: pipx run --spec build pyproject-build --sdist + run: pipx run build --sdist - name: Check metadata run: pipx run twine check dist/* @@ -61,7 +58,7 @@ jobs: with: platforms: all - - uses: pypa/cibuildwheel@v1.12.0 + - uses: pypa/cibuildwheel@v2.0.0a4 env: CIBW_BUILD: cp${{ matrix.python }}-* CIBW_ARCHS: ${{ matrix.arch }} @@ -113,7 +110,7 @@ jobs: with: submodules: true - - uses: pypa/cibuildwheel@v1.12.0 + - uses: pypa/cibuildwheel@v2.0.0a4 env: CIBW_BUILD: ${{ matrix.build }} CIBW_MANYLINUX_I686_IMAGE: ${{ matrix.CIBW_MANYLINUX_I686_IMAGE }} diff --git a/pyproject.toml b/pyproject.toml index 925cbd144..4380d530a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -80,3 +80,9 @@ ignore = [ "src/boost_histogram/version.py", "tests/.pytest_cache/**", ] + + +[tool.cibuildwheel] +test-extras = "test" +test-command = "pytest {project}/tests" +test-skip = ["pp*macos*", "pp*win*", "*universal2:arm64"] From 9bf0abab76f8f95e38dc290dd3088b262ddcc14a Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 5 Jul 2021 23:00:30 -0400 Subject: [PATCH 2/2] ci: test on 3.10 too --- .github/workflows/tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 40b07b10e..fbc6d4177 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -53,6 +53,7 @@ jobs: include: - python-version: "3.8" cmake-extras: "-DCMAKE_CXX_STANDARD=17" + - python-version: "3.10-dev" name: CMake Python ${{ matrix.python-version }} @@ -92,8 +93,9 @@ jobs: - uses: pypa/cibuildwheel@v2.0.0a4 env: - CIBW_BUILD: cp38-win_amd64 cp36-manylinux_i686 cp37-macosx_x86_64 + CIBW_BUILD: cp38-win_amd64 cp310-manylinux_i686 cp37-macosx_x86_64 CIBW_BUILD_VERBOSITY: 1 + CIBW_PRERELEASE_PYTHONS: 1 - uses: actions/upload-artifact@v2 with: