From 35ff1e6d419ad8eb0e52dfe87814069128716759 Mon Sep 17 00:00:00 2001 From: Genevieve Buckley <30920819+GenevieveBuckley@users.noreply.github.com> Date: Tue, 14 May 2024 16:35:55 +1000 Subject: [PATCH 1/6] Update python 3.9 environment, confirm it works on arm64 Mac --- continuous_integration/environment-3.9.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/continuous_integration/environment-3.9.yml b/continuous_integration/environment-3.9.yml index 9c4e79ac..5654baef 100644 --- a/continuous_integration/environment-3.9.yml +++ b/continuous_integration/environment-3.9.yml @@ -12,7 +12,7 @@ dependencies: - pytest==6.2.5 - pytest-cov==4.0.0 - pytest-flake8==1.0.7 - - dask==2023.2.1 + - dask==2024.4.1 - numpy==1.22.1 - scipy==1.7.3 - scikit-image==0.19.1 From 8f244eedb480a10f190947cf28f737d7bf4badf3 Mon Sep 17 00:00:00 2001 From: Genevieve Buckley <30920819+GenevieveBuckley@users.noreply.github.com> Date: Tue, 14 May 2024 16:36:58 +1000 Subject: [PATCH 2/6] Update dask to v2-24.4.1, see PR 363 --- continuous_integration/environment-3.10.yml | 2 +- continuous_integration/environment-3.11.yml | 2 +- continuous_integration/environment-doc.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/continuous_integration/environment-3.10.yml b/continuous_integration/environment-3.10.yml index e4b5f097..6d1f4827 100644 --- a/continuous_integration/environment-3.10.yml +++ b/continuous_integration/environment-3.10.yml @@ -12,7 +12,7 @@ dependencies: - pytest==7.2.2 - pytest-cov==4.0.0 - pytest-flake8==1.1.1 - - dask==2023.3.1 + - dask==2024.4.1 - numpy==1.24.2 - scipy==1.10.1 - scikit-image==0.19.3 diff --git a/continuous_integration/environment-3.11.yml b/continuous_integration/environment-3.11.yml index b9019bbb..7123514e 100644 --- a/continuous_integration/environment-3.11.yml +++ b/continuous_integration/environment-3.11.yml @@ -12,7 +12,7 @@ dependencies: - pytest==7.2.2 - pytest-cov==4.0.0 - pytest-flake8==1.1.1 - - dask==2023.3.1 + - dask==2024.4.1 - numpy==1.24.2 - scipy==1.10.1 - scikit-image==0.19.3 diff --git a/continuous_integration/environment-doc.yml b/continuous_integration/environment-doc.yml index 88e6f07f..709e8aca 100644 --- a/continuous_integration/environment-doc.yml +++ b/continuous_integration/environment-doc.yml @@ -8,7 +8,7 @@ dependencies: - pip==22.3 - wheel==0.37.1 - jinja2<3.1 - - dask==2023.2.0 + - dask==2024.4.1 - numpy==1.23.4 - scipy==1.9.2 - scikit-image==0.19.3 From 6676604f8d6bddf0771c33efe3cd1488b7f20140 Mon Sep 17 00:00:00 2001 From: Genevieve Buckley <30920819+GenevieveBuckley@users.noreply.github.com> Date: Tue, 14 May 2024 17:02:36 +1000 Subject: [PATCH 3/6] Update environment-3.9.yml with versions confirmed to work on arm64 Mac --- continuous_integration/environment-3.9.yml | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/continuous_integration/environment-3.9.yml b/continuous_integration/environment-3.9.yml index 5654baef..ee088c2f 100644 --- a/continuous_integration/environment-3.9.yml +++ b/continuous_integration/environment-3.9.yml @@ -5,17 +5,17 @@ channels: dependencies: - python=3.9.* - - pip==22.0.2 - - wheel==0.37.1 - - coverage==6.3 - - flake8==4.0.1 - - pytest==6.2.5 - - pytest-cov==4.0.0 - - pytest-flake8==1.0.7 + - pip==24.0 + - wheel==0.43.0 + - coverage==7.5.1 + - flake8==7.0.0 + - pytest==8.2.0 + - pytest-cov==5.0.0 + - pytest-flake8==1.1.1 - dask==2024.4.1 - - numpy==1.22.1 - - scipy==1.7.3 - - scikit-image==0.19.1 - - pims==0.5 - - slicerator==1.0.0 - - pandas==2.0.0 + - numpy==1.26.4 + - scipy==1.13.0 + - scikit-image==0.22.0 + - pims==0.6.1 + - slicerator==1.1.0 + - pandas==2.2.2 From ed26de83b6d1c27dc0ee9c4f21868281b53e35b0 Mon Sep 17 00:00:00 2001 From: Genevieve Buckley <30920819+GenevieveBuckley@users.noreply.github.com> Date: Tue, 14 May 2024 17:07:07 +1000 Subject: [PATCH 4/6] Temporarily disable CI fail fast option, so we can see if all CI conda envs are created sucessfully --- .github/workflows/test_and_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 0de3f21c..2a5e8a44 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -13,7 +13,7 @@ jobs: test: runs-on: ${{ matrix.os }} strategy: - fail-fast: true + # fail-fast: true matrix: os: ["windows-latest", "ubuntu-latest", "macos-latest"] python-version: ["3.9", "3.10", "3.11"] From 0b294112ce17530f44d00b4ab59593421ded2366 Mon Sep 17 00:00:00 2001 From: Genevieve Buckley <30920819+GenevieveBuckley@users.noreply.github.com> Date: Tue, 14 May 2024 17:19:42 +1000 Subject: [PATCH 5/6] Turn off CI fail fast temporarily (most restore it later) --- .github/workflows/test_and_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 2a5e8a44..aecb6d80 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -13,7 +13,7 @@ jobs: test: runs-on: ${{ matrix.os }} strategy: - # fail-fast: true + fail-fast: false matrix: os: ["windows-latest", "ubuntu-latest", "macos-latest"] python-version: ["3.9", "3.10", "3.11"] From 39815ef93a9766bd67b20bf36026d3eb726e914f Mon Sep 17 00:00:00 2001 From: Genevieve Buckley <30920819+GenevieveBuckley@users.noreply.github.com> Date: Tue, 14 May 2024 17:36:32 +1000 Subject: [PATCH 6/6] fail fast in CI .github/workflows/test_and_deploy.yml --- .github/workflows/test_and_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index aecb6d80..0de3f21c 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -13,7 +13,7 @@ jobs: test: runs-on: ${{ matrix.os }} strategy: - fail-fast: false + fail-fast: true matrix: os: ["windows-latest", "ubuntu-latest", "macos-latest"] python-version: ["3.9", "3.10", "3.11"]