From 6ae4e162d1322ab62a1042a55b89c2971f67c185 Mon Sep 17 00:00:00 2001 From: Jake VanCampen Date: Wed, 7 Feb 2024 20:43:56 -0800 Subject: [PATCH 1/7] build and test on arm64 mac --- .github/workflows/ci.yml | 62 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d6b3c25..d58306a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,6 +130,37 @@ jobs: python-version: '3.12' numpy-version: '1.26.*' + - os-image: macos-latest + os-name: mac + macos-min-version: '10.9' + python-arch: 'arm64' + python-version: '3.8' + numpy-version: '1.17.*' + - os-image: macos-latest + os-name: mac + macos-min-version: '10.9' + python-arch: 'arm64' + python-version: '3.9' + numpy-version: '1.19.*' + - os-image: macos-latest + os-name: mac + macos-min-version: '10.9' + python-arch: 'arm64' + python-version: '3.10' + numpy-version: '1.21.*' + - os-image: macos-latest + os-name: mac + macos-min-version: '10.9' + python-arch: 'arm64' + python-version: '3.11' + numpy-version: '1.23.*' + - os-image: macos-latest + os-name: mac + macos-min-version: '10.9' + python-arch: 'arm64' + python-version: '3.12' + numpy-version: '1.26.*' + - os-image: windows-2019 os-name: windows python-arch: 'x86_64' @@ -304,6 +335,37 @@ jobs: python-arch: 'x86_64' python-version: '3.12' numpy-version: '1.26.*' + + - os-image: macos-latest + os-name: mac + macos-min-version: '10.9' + python-arch: 'arm64' + python-version: '3.8' + numpy-version: '1.17.*' + - os-image: macos-latest + os-name: mac + macos-min-version: '10.9' + python-arch: 'arm64' + python-version: '3.9' + numpy-version: '1.19.*' + - os-image: macos-latest + os-name: mac + macos-min-version: '10.9' + python-arch: 'arm64' + python-version: '3.10' + numpy-version: '1.21.*' + - os-image: macos-latest + os-name: mac + macos-min-version: '10.9' + python-arch: 'arm64' + python-version: '3.11' + numpy-version: '1.23.*' + - os-image: macos-latest + os-name: mac + macos-min-version: '10.9' + python-arch: 'arm64' + python-version: '3.12' + numpy-version: '1.26.*' - os-image: windows-2019 os-name: windows From f833b1ac4565281c830d6d124693420fc6030f75 Mon Sep 17 00:00:00 2001 From: Jake VanCampen Date: Thu, 8 Feb 2024 12:40:44 -0800 Subject: [PATCH 2/7] macos-14 --- .github/workflows/ci.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d58306a..7bf9b5d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,33 +130,33 @@ jobs: python-version: '3.12' numpy-version: '1.26.*' - - os-image: macos-latest + - os-image: macos-14 os-name: mac - macos-min-version: '10.9' + macos-min-version: '10.14' python-arch: 'arm64' python-version: '3.8' numpy-version: '1.17.*' - - os-image: macos-latest + - os-image: macos-14 os-name: mac - macos-min-version: '10.9' + macos-min-version: '10.14' python-arch: 'arm64' python-version: '3.9' numpy-version: '1.19.*' - - os-image: macos-latest + - os-image: macos-14 os-name: mac - macos-min-version: '10.9' + macos-min-version: '10.14' python-arch: 'arm64' python-version: '3.10' numpy-version: '1.21.*' - - os-image: macos-latest + - os-image: macos-14 os-name: mac - macos-min-version: '10.9' + macos-min-version: '10.14' python-arch: 'arm64' python-version: '3.11' numpy-version: '1.23.*' - - os-image: macos-latest + - os-image: macos-14 os-name: mac - macos-min-version: '10.9' + macos-min-version: '10.14' python-arch: 'arm64' python-version: '3.12' numpy-version: '1.26.*' @@ -336,33 +336,33 @@ jobs: python-version: '3.12' numpy-version: '1.26.*' - - os-image: macos-latest + - os-image: macos-14 os-name: mac - macos-min-version: '10.9' + macos-min-version: '10.14' python-arch: 'arm64' python-version: '3.8' numpy-version: '1.17.*' - - os-image: macos-latest + - os-image: macos-14 os-name: mac - macos-min-version: '10.9' + macos-min-version: '10.14' python-arch: 'arm64' python-version: '3.9' numpy-version: '1.19.*' - - os-image: macos-latest + - os-image: macos-14 os-name: mac - macos-min-version: '10.9' + macos-min-version: '10.14' python-arch: 'arm64' python-version: '3.10' numpy-version: '1.21.*' - - os-image: macos-latest + - os-image: macos-14 os-name: mac - macos-min-version: '10.9' + macos-min-version: '10.14' python-arch: 'arm64' python-version: '3.11' numpy-version: '1.23.*' - - os-image: macos-latest + - os-image: macos-14 os-name: mac - macos-min-version: '10.9' + macos-min-version: '10.14' python-arch: 'arm64' python-version: '3.12' numpy-version: '1.26.*' From b72abc9ee68cdc67e432ebdd3049b78aa2dc288c Mon Sep 17 00:00:00 2001 From: Jake VanCampen Date: Fri, 9 Feb 2024 10:03:34 -0800 Subject: [PATCH 3/7] use correct min version --- .github/workflows/ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7bf9b5d..7089a83 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,31 +132,31 @@ jobs: - os-image: macos-14 os-name: mac - macos-min-version: '10.14' + macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.8' numpy-version: '1.17.*' - os-image: macos-14 os-name: mac - macos-min-version: '10.14' + macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.9' numpy-version: '1.19.*' - os-image: macos-14 os-name: mac - macos-min-version: '10.14' + macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.10' numpy-version: '1.21.*' - os-image: macos-14 os-name: mac - macos-min-version: '10.14' + macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.11' numpy-version: '1.23.*' - os-image: macos-14 os-name: mac - macos-min-version: '10.14' + macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.12' numpy-version: '1.26.*' @@ -338,31 +338,31 @@ jobs: - os-image: macos-14 os-name: mac - macos-min-version: '10.14' + macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.8' numpy-version: '1.17.*' - os-image: macos-14 os-name: mac - macos-min-version: '10.14' + macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.9' numpy-version: '1.19.*' - os-image: macos-14 os-name: mac - macos-min-version: '10.14' + macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.10' numpy-version: '1.21.*' - os-image: macos-14 os-name: mac - macos-min-version: '10.14' + macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.11' numpy-version: '1.23.*' - os-image: macos-14 os-name: mac - macos-min-version: '10.14' + macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.12' numpy-version: '1.26.*' From 612a5eefeb5ed8cc105764ce8ffdced033985b2c Mon Sep 17 00:00:00 2001 From: Jake VanCampen Date: Fri, 9 Feb 2024 10:15:40 -0800 Subject: [PATCH 4/7] update numpy versions --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7089a83..fbc2e00 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -135,25 +135,25 @@ jobs: macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.8' - numpy-version: '1.17.*' + numpy-version: '1.24.*' - os-image: macos-14 os-name: mac macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.9' - numpy-version: '1.19.*' + numpy-version: '1.24.*' - os-image: macos-14 os-name: mac macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.10' - numpy-version: '1.21.*' + numpy-version: '1.25.*' - os-image: macos-14 os-name: mac macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.11' - numpy-version: '1.23.*' + numpy-version: '1.25.*' - os-image: macos-14 os-name: mac macos-min-version: '11.5' @@ -341,25 +341,25 @@ jobs: macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.8' - numpy-version: '1.17.*' + numpy-version: '1.24.*' - os-image: macos-14 os-name: mac macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.9' - numpy-version: '1.19.*' + numpy-version: '1.24.*' - os-image: macos-14 os-name: mac macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.10' - numpy-version: '1.21.*' + numpy-version: '1.25.*' - os-image: macos-14 os-name: mac macos-min-version: '11.5' python-arch: 'arm64' python-version: '3.11' - numpy-version: '1.23.*' + numpy-version: '1.25.*' - os-image: macos-14 os-name: mac macos-min-version: '11.5' From 3223270fb682ddd59a4a3be66855da0bc7e19173 Mon Sep 17 00:00:00 2001 From: Jake VanCampen Date: Mon, 12 Feb 2024 10:34:02 -0800 Subject: [PATCH 5/7] only supports 3.12 --- .github/workflows/ci.yml | 48 ---------------------------------------- 1 file changed, 48 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fbc2e00..21e185a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,30 +130,6 @@ jobs: python-version: '3.12' numpy-version: '1.26.*' - - os-image: macos-14 - os-name: mac - macos-min-version: '11.5' - python-arch: 'arm64' - python-version: '3.8' - numpy-version: '1.24.*' - - os-image: macos-14 - os-name: mac - macos-min-version: '11.5' - python-arch: 'arm64' - python-version: '3.9' - numpy-version: '1.24.*' - - os-image: macos-14 - os-name: mac - macos-min-version: '11.5' - python-arch: 'arm64' - python-version: '3.10' - numpy-version: '1.25.*' - - os-image: macos-14 - os-name: mac - macos-min-version: '11.5' - python-arch: 'arm64' - python-version: '3.11' - numpy-version: '1.25.*' - os-image: macos-14 os-name: mac macos-min-version: '11.5' @@ -336,30 +312,6 @@ jobs: python-version: '3.12' numpy-version: '1.26.*' - - os-image: macos-14 - os-name: mac - macos-min-version: '11.5' - python-arch: 'arm64' - python-version: '3.8' - numpy-version: '1.24.*' - - os-image: macos-14 - os-name: mac - macos-min-version: '11.5' - python-arch: 'arm64' - python-version: '3.9' - numpy-version: '1.24.*' - - os-image: macos-14 - os-name: mac - macos-min-version: '11.5' - python-arch: 'arm64' - python-version: '3.10' - numpy-version: '1.25.*' - - os-image: macos-14 - os-name: mac - macos-min-version: '11.5' - python-arch: 'arm64' - python-version: '3.11' - numpy-version: '1.25.*' - os-image: macos-14 os-name: mac macos-min-version: '11.5' From a4a316d5903333f02342a3de3195a9a62793665c Mon Sep 17 00:00:00 2001 From: Jake VanCampen Date: Mon, 12 Feb 2024 16:08:52 -0800 Subject: [PATCH 6/7] setuptools has distutils for python 3.12 --- dev-requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-requirements.txt b/dev-requirements.txt index 6f8c9f8..b550b16 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -12,6 +12,7 @@ scikit-image # test dependencies pytest imageio +setuptools # documentation dependencies sphinx_rtd_theme From d2e3878084713d6a28d6b3a7d8e9fdab90cb3938 Mon Sep 17 00:00:00 2001 From: Jake VanCampen Date: Tue, 13 Feb 2024 07:56:08 -0800 Subject: [PATCH 7/7] 11.0 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21e185a..863b486 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,7 +132,7 @@ jobs: - os-image: macos-14 os-name: mac - macos-min-version: '11.5' + macos-min-version: '11.0' python-arch: 'arm64' python-version: '3.12' numpy-version: '1.26.*' @@ -314,7 +314,7 @@ jobs: - os-image: macos-14 os-name: mac - macos-min-version: '11.5' + macos-min-version: '11.0' python-arch: 'arm64' python-version: '3.12' numpy-version: '1.26.*'