From 98b87270a71bfed7ebf1d0a248afba662f974a55 Mon Sep 17 00:00:00 2001 From: Jim Kitchen Date: Thu, 23 Mar 2023 08:57:45 -0500 Subject: [PATCH 1/6] Bump version for testpypi --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5cc1519..38c094c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ requires = [ name = "suitesparse-graphblas" #dynamic = ["version"] # TODO -version = "0.0.3" +version = "0.0.4" description = "SuiteSparse:GraphBLAS Python bindings." readme = "README.md" requires-python = ">=3.8" @@ -29,7 +29,7 @@ maintainers = [ {name = "Michel Pelletier", email = "michel@graphegon.com"}, ] classifiers = [ - "Development Status :: 4 - Beta", + "Development Status :: 5 - Production/Stable", "License :: OSI Approved :: Apache Software License", "Operating System :: MacOS :: MacOS X", "Operating System :: POSIX :: Linux", From 89c422fc413e5e083f677b300bac8063b75d9f0d Mon Sep 17 00:00:00 2001 From: Jim Kitchen Date: Thu, 23 Mar 2023 10:23:03 -0500 Subject: [PATCH 2/6] Update for linux images --- .github/workflows/wheels.yml | 16 ++++++++-------- pyproject.toml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 7991df9..d802769 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -40,23 +40,23 @@ jobs: # Loosely based on scikit-learn's config: # https://github.com/scikit-learn/scikit-learn/blob/main/.github/workflows/wheels.yml include: - - os: windows-latest - python-version: "3.8" - platform_id: win_amd64 +# - os: windows-latest +# python-version: "3.8" +# platform_id: win_amd64 - os: ubuntu-latest python-version: "3.8" platform_id: manylinux_x86_64 - manylinux_image: manylinux2014 + manylinux_image: manylinux2014_x86_64 - os: ubuntu-latest python-version: "3.8" platform_id: manylinux_aarch64 - manylinux_image: manylinux2014 + manylinux_image: manylinux2014_aarch64 # Use x86 macOS runner to build both x86 and ARM. GitHub does not offer M1/M2 yet (only self-hosted). - - os: macos-latest - python-version: "3.8" - platform_id: macosx_x86_64 +# - os: macos-latest +# python-version: "3.8" +# platform_id: macosx_x86_64 steps: - uses: actions/checkout@v3 diff --git a/pyproject.toml b/pyproject.toml index 38c094c..6e861e5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ requires = [ name = "suitesparse-graphblas" #dynamic = ["version"] # TODO -version = "0.0.4" +version = "0.0.4.1" description = "SuiteSparse:GraphBLAS Python bindings." readme = "README.md" requires-python = ">=3.8" From c4bf20d30a5a921273d5d533654927716e28512b Mon Sep 17 00:00:00 2001 From: Jim Kitchen Date: Thu, 23 Mar 2023 13:40:57 -0500 Subject: [PATCH 3/6] Enable linux aarch64, disable osx-arm64 --- .github/workflows/wheels.yml | 5 ++++- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index d802769..15fe47d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -98,8 +98,11 @@ jobs: # TODO CIBW_BUILD: "cp*" + # linux: build x86_64 and aarch64 + CIBW_ARCHS_LINUX: "x86_64 aarch64" + # macOS: build x86_64 and arm64 - CIBW_ARCHS_MACOS: "x86_64 arm64" + #CIBW_ARCHS_MACOS: "x86_64 arm64" # No 32-bit builds # TODO diff --git a/pyproject.toml b/pyproject.toml index 6e861e5..0630840 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ requires = [ name = "suitesparse-graphblas" #dynamic = ["version"] # TODO -version = "0.0.4.1" +version = "0.0.4.2" description = "SuiteSparse:GraphBLAS Python bindings." readme = "README.md" requires-python = ">=3.8" From f890700fe7a8d502c11ee486cc029c64122b6361 Mon Sep 17 00:00:00 2001 From: Jim Kitchen Date: Thu, 23 Mar 2023 15:02:02 -0500 Subject: [PATCH 4/6] Bunch of changes from scikit-learn's file --- .github/workflows/wheels.yml | 71 ++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 20 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 15fe47d..e9062c4 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -32,7 +32,7 @@ jobs: build_wheels: - name: Wheels on ${{ matrix.platform_id }} - ${{ matrix.os }} + name: Wheels on cp${{ matrix.python }}-${{ matrix.platform_id }}-${{ matrix.manylinux_image }} runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -40,23 +40,50 @@ jobs: # Loosely based on scikit-learn's config: # https://github.com/scikit-learn/scikit-learn/blob/main/.github/workflows/wheels.yml include: -# - os: windows-latest -# python-version: "3.8" -# platform_id: win_amd64 - + - os: windows-latest + python: 38 + platform_id: win_amd64 + - os: windows-latest + python: 39 + platform_id: win_amd64 + - os: windows-latest + python: 310 + platform_id: win_amd64 + - os: windows-latest + python: 311 + platform_id: win_amd64 + + # Linux 64 bit manylinux2014 - os: ubuntu-latest - python-version: "3.8" + python: 38 platform_id: manylinux_x86_64 - manylinux_image: manylinux2014_x86_64 + manylinux_image: manylinux2014 - os: ubuntu-latest - python-version: "3.8" - platform_id: manylinux_aarch64 - manylinux_image: manylinux2014_aarch64 - - # Use x86 macOS runner to build both x86 and ARM. GitHub does not offer M1/M2 yet (only self-hosted). -# - os: macos-latest -# python-version: "3.8" -# platform_id: macosx_x86_64 + python: 39 + platform_id: manylinux_x86_64 + manylinux_image: manylinux2014 + - os: ubuntu-latest + python: 310 + platform_id: manylinux_x86_64 + manylinux_image: manylinux2014 + - os: ubuntu-latest + python: 311 + platform_id: manylinux_x86_64 + manylinux_image: manylinux2014 + + # MacOS x86_64 + - os: macos-latest + python: 38 + platform_id: macosx_x86_64 + - os: macos-latest + python: 39 + platform_id: macosx_x86_64 + - os: macos-latest + python: 310 + platform_id: macosx_x86_64 + - os: macos-latest + python: 311 + platform_id: macosx_x86_64 steps: - uses: actions/checkout@v3 @@ -65,7 +92,7 @@ jobs: - uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python-version }} + python-version: '3.9' - name: Install tools (macOS) if: contains(matrix.os, 'macos') @@ -80,8 +107,8 @@ jobs: - name: Build Wheels env: - # very verbose - CIBW_BUILD_VERBOSITY: 3 + # somewhat verbose + CIBW_BUILD_VERBOSITY: 2 # Build SuiteSparse # CIBW_BEFORE_ALL: bash suitesparse.sh ${{ github.ref }} @@ -96,10 +123,14 @@ jobs: # Uncomment to only build CPython wheels # TODO - CIBW_BUILD: "cp*" + CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }} + + CIBW_ARCHS: all # linux: build x86_64 and aarch64 - CIBW_ARCHS_LINUX: "x86_64 aarch64" +# CIBW_ARCHS_LINUX: "x86_64 aarch64" + + CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux_image }} # macOS: build x86_64 and arm64 #CIBW_ARCHS_MACOS: "x86_64 arm64" From 200a443d8757dd8a02930ec0978c6b82227b0bd9 Mon Sep 17 00:00:00 2001 From: Jim Kitchen Date: Thu, 23 Mar 2023 15:43:42 -0500 Subject: [PATCH 5/6] Undo last changes --- .github/workflows/wheels.yml | 54 ++++++------------------------------ pyproject.toml | 4 +-- 2 files changed, 10 insertions(+), 48 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index e9062c4..22402a8 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -32,7 +32,7 @@ jobs: build_wheels: - name: Wheels on cp${{ matrix.python }}-${{ matrix.platform_id }}-${{ matrix.manylinux_image }} + name: Wheels on ${{ matrix.platform_id }} - ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -41,48 +41,19 @@ jobs: # https://github.com/scikit-learn/scikit-learn/blob/main/.github/workflows/wheels.yml include: - os: windows-latest - python: 38 - platform_id: win_amd64 - - os: windows-latest - python: 39 - platform_id: win_amd64 - - os: windows-latest - python: 310 - platform_id: win_amd64 - - os: windows-latest - python: 311 + python-version: "3.8" platform_id: win_amd64 # Linux 64 bit manylinux2014 - os: ubuntu-latest + python-version: "3.8" python: 38 platform_id: manylinux_x86_64 manylinux_image: manylinux2014 - - os: ubuntu-latest - python: 39 - platform_id: manylinux_x86_64 - manylinux_image: manylinux2014 - - os: ubuntu-latest - python: 310 - platform_id: manylinux_x86_64 - manylinux_image: manylinux2014 - - os: ubuntu-latest - python: 311 - platform_id: manylinux_x86_64 - manylinux_image: manylinux2014 - # MacOS x86_64 + # Use x86 macOS runner to build both x86 and ARM. GitHub does not offer M1/M2 yet (only self-hosted). - os: macos-latest - python: 38 - platform_id: macosx_x86_64 - - os: macos-latest - python: 39 - platform_id: macosx_x86_64 - - os: macos-latest - python: 310 - platform_id: macosx_x86_64 - - os: macos-latest - python: 311 + python-version: "3.8" platform_id: macosx_x86_64 steps: @@ -92,7 +63,7 @@ jobs: - uses: actions/setup-python@v4 with: - python-version: '3.9' + python-version: ${{ matrix.python-version }} - name: Install tools (macOS) if: contains(matrix.os, 'macos') @@ -107,8 +78,8 @@ jobs: - name: Build Wheels env: - # somewhat verbose - CIBW_BUILD_VERBOSITY: 2 + # very verbose + CIBW_BUILD_VERBOSITY: 3 # Build SuiteSparse # CIBW_BEFORE_ALL: bash suitesparse.sh ${{ github.ref }} @@ -123,14 +94,7 @@ jobs: # Uncomment to only build CPython wheels # TODO - CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }} - - CIBW_ARCHS: all - - # linux: build x86_64 and aarch64 -# CIBW_ARCHS_LINUX: "x86_64 aarch64" - - CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux_image }} + CIBW_BUILD: "cp*" # macOS: build x86_64 and arm64 #CIBW_ARCHS_MACOS: "x86_64 arm64" diff --git a/pyproject.toml b/pyproject.toml index 0630840..beccc7a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,9 +11,7 @@ requires = [ [project] name = "suitesparse-graphblas" -#dynamic = ["version"] -# TODO -version = "0.0.4.2" +dynamic = ["version"] description = "SuiteSparse:GraphBLAS Python bindings." readme = "README.md" requires-python = ">=3.8" From ec69ef74157522b342f2d56f4e6faca1bcb521ae Mon Sep 17 00:00:00 2001 From: Jim Kitchen Date: Fri, 24 Mar 2023 10:39:38 -0500 Subject: [PATCH 6/6] Try to see what is modifying repo --- .github/workflows/wheels.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 22402a8..2cfa36e 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -40,21 +40,20 @@ jobs: # Loosely based on scikit-learn's config: # https://github.com/scikit-learn/scikit-learn/blob/main/.github/workflows/wheels.yml include: - - os: windows-latest - python-version: "3.8" - platform_id: win_amd64 +# - os: windows-latest +# python-version: "3.8" +# platform_id: win_amd64 # Linux 64 bit manylinux2014 - os: ubuntu-latest python-version: "3.8" - python: 38 platform_id: manylinux_x86_64 manylinux_image: manylinux2014 # Use x86 macOS runner to build both x86 and ARM. GitHub does not offer M1/M2 yet (only self-hosted). - - os: macos-latest - python-version: "3.8" - platform_id: macosx_x86_64 +# - os: macos-latest +# python-version: "3.8" +# platform_id: macosx_x86_64 steps: - uses: actions/checkout@v3 @@ -122,8 +121,11 @@ jobs: CIBW_TEST_SKIP: "*-macosx_arm64" run: | + git status python -m pip install cibuildwheel python -m cibuildwheel --output-dir wheelhouse . + git status + git diff . shell: bash - uses: actions/upload-artifact@v3