From 813ad2a1ba77e80c57a891e38f98cebe4fbd6ed1 Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Tue, 1 Jun 2021 14:14:19 -0400 Subject: [PATCH 1/7] CI Removes python 3.6 builds [cd build] --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index ffddf9ef88db3..75c1eab90d8bd 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -48,7 +48,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest, macos-latest] - python: [36, 37, 38, 39] + python: [37, 38, 39] bitness: [32, 64] manylinux_image: [manylinux1, manylinux2010] include: From e5ace978ba5f76337810baa8dd6aac1031e02f53 Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Tue, 1 Jun 2021 14:23:14 -0400 Subject: [PATCH 2/7] DOC Update comments --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 75c1eab90d8bd..79d1436cc38a1 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -36,7 +36,7 @@ jobs: name: Check build trigger run: bash build_tools/github/check_build_trigger.sh - # Build the wheels for Linux, Windows and macOS for Python 3.6 and newer + # Build the wheels for Linux, Windows and macOS for Python 3.7 and newer build_wheels: name: Build wheel for cp${{ matrix.python }}-${{ matrix.platform_id }}-${{ matrix.manylinux_image }} runs-on: ${{ matrix.os }} From d26b0169d46f380eea4cdccb00dce26dc3f24d04 Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Tue, 1 Jun 2021 16:03:43 -0400 Subject: [PATCH 3/7] MNT Uses slightly newer version of wheels [cd build] --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 84468f65341da..4d85fa87f8f80 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,5 +11,8 @@ requires = [ # see: https://github.com/scipy/oldest-supported-numpy/blob/master/setup.cfg "oldest-supported-numpy", + # Override oldest-supported-numpy setting because pandas 0.25.0 requires 1.14.6 + "numpy==1.14.6; python_version=='3.7' and platform_machine!='aarch64' and platform_system!='AIX' and platform_python_implementation != 'PyPy'", + "scipy>=1.1.0", ] From 93e18ca97106425fa9ad422f17a89b560ab23f67 Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Tue, 1 Jun 2021 16:04:25 -0400 Subject: [PATCH 4/7] CI [cd build] From 11eff5eaaded314006294703fb984f2fa636ec1e Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Tue, 1 Jun 2021 16:25:48 -0400 Subject: [PATCH 5/7] CI pin scipy for python 3.7 [cd build] --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4d85fa87f8f80..3fb641412b025 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,6 +13,6 @@ requires = [ # Override oldest-supported-numpy setting because pandas 0.25.0 requires 1.14.6 "numpy==1.14.6; python_version=='3.7' and platform_machine!='aarch64' and platform_system!='AIX' and platform_python_implementation != 'PyPy'", - - "scipy>=1.1.0", + "scipy==1.1.0; python_version=='3.7'", + "scipy>=1.1.0; python_version!='3.7'", ] From ae2d4a816aeff56af5f620ae675bf33e2bef0933 Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Tue, 1 Jun 2021 16:35:39 -0400 Subject: [PATCH 6/7] CI Try pinning oldest-supported-numpy [cd build] --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3fb641412b025..d172baaea7088 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,10 +9,10 @@ requires = [ # wheels on PyPI # # see: https://github.com/scipy/oldest-supported-numpy/blob/master/setup.cfg - "oldest-supported-numpy", + "oldest-supported-numpy; python_version!='3.7' or platform_machine=='aarch64' or platform_system=='AIX' or platform_python_implementation == 'PyPy'", # Override oldest-supported-numpy setting because pandas 0.25.0 requires 1.14.6 "numpy==1.14.6; python_version=='3.7' and platform_machine!='aarch64' and platform_system!='AIX' and platform_python_implementation != 'PyPy'", - "scipy==1.1.0; python_version=='3.7'", - "scipy>=1.1.0; python_version!='3.7'", + + "scipy>=1.1.0", ] From a5f486cd2e502fa7678815fb590aa39fa2a9f758 Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Tue, 1 Jun 2021 21:48:53 -0400 Subject: [PATCH 7/7] CI Check versions used by pip wheel [cd build] --- .github/workflows/wheels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 79d1436cc38a1..a280c29c31683 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -102,6 +102,7 @@ jobs: CIBW_TEST_REQUIRES: pytest pandas threadpoolctl CIBW_TEST_COMMAND: bash {project}/build_tools/github/test_wheels.sh CIBW_TEST_COMMAND_WINDOWS: bash {project}/build_tools/github/test_windows_wheels.sh ${{ matrix.python }} ${{ matrix.bitness }} + CIBW_BUILD_VERBOSITY: 1 run: bash build_tools/github/build_wheels.sh