Update workflows and ros3 env to use macos-latest (#1926)

NeurodataWithoutBorders · Jun 28, 2024 · 3c5fa48 · 3c5fa48
1 parent 9a46106
commit 3c5fa48
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/.github/workflows/run_all_tests.yml b/.github/workflows/run_all_tests.yml
@@ -38,8 +38,9 @@ jobs:
           - { name: windows-python3.12           , test-tox-env: py312           , build-tox-env: build-py312           , python-ver: "3.12", os: windows-latest }
           - { name: windows-python3.12-upgraded  , test-tox-env: py312-upgraded  , build-tox-env: build-py312-upgraded  , python-ver: "3.12", os: windows-latest }
           - { name: windows-python3.12-prerelease, test-tox-env: py312-prerelease, build-tox-env: build-py312-prerelease, python-ver: "3.11", os: windows-latest }
+          # minimum versions of dependencies do not have wheels or cannot be built on macos-arm64
           - { name: macos-python3.8-minimum      , test-tox-env: py38-minimum    , build-tox-env: build-py38-minimum    , python-ver: "3.8" , os: macos-13 }
-          - { name: macos-python3.9              , test-tox-env: py39            , build-tox-env: build-py39            , python-ver: "3.9" , os: macos-13 }
+          - { name: macos-python3.9              , test-tox-env: py39            , build-tox-env: build-py39            , python-ver: "3.9" , os: macos-latest }
           - { name: macos-python3.10             , test-tox-env: py310           , build-tox-env: build-py310           , python-ver: "3.10", os: macos-latest }
           - { name: macos-python3.11             , test-tox-env: py311           , build-tox-env: build-py311           , python-ver: "3.11", os: macos-latest }
           - { name: macos-python3.11-opt         , test-tox-env: py311-optional  , build-tox-env: build-py311           , python-ver: "3.11", os: macos-latest }
@@ -98,6 +99,7 @@ jobs:
           - { name: windows-gallery-python3.8-minimum    , test-tox-env: gallery-py38-minimum    , python-ver: "3.8" , os: windows-latest }
           - { name: windows-gallery-python3.12-upgraded  , test-tox-env: gallery-py312-upgraded  , python-ver: "3.12", os: windows-latest }
           - { name: windows-gallery-python3.12-prerelease, test-tox-env: gallery-py312-prerelease, python-ver: "3.12", os: windows-latest }
+          # minimum versions of dependencies do not have wheels or cannot be built on macos-arm64
           - { name: macos-gallery-python3.8-minimum      , test-tox-env: gallery-py38-minimum    , python-ver: "3.8" , os: macos-13 }
           - { name: macos-gallery-python3.12-upgraded    , test-tox-env: gallery-py312-upgraded  , python-ver: "3.12", os: macos-latest }
           - { name: macos-gallery-python3.12-prerelease  , test-tox-env: gallery-py312-prerelease, python-ver: "3.12", os: macos-latest }
@@ -201,7 +203,7 @@ jobs:
         include:
           - { name: conda-linux-python3.12-ros3  , python-ver: "3.12", os: ubuntu-latest }
           - { name: conda-windows-python3.12-ros3, python-ver: "3.12", os: windows-latest }
-          - { name: conda-macos-python3.12-ros3  , python-ver: "3.12", os: macos-13 } # This is due to DANDI not supporting osx-arm64. Will support macos-latest when this changes.
+          - { name: conda-macos-python3.12-ros3  , python-ver: "3.12", os: macos-latest }
     steps:
       - name: Cancel non-latest runs
         uses: styfle/[email protected]
@@ -248,7 +250,7 @@ jobs:
         include:
           - { name: conda-linux-gallery-python3.12-ros3  , python-ver: "3.12", os: ubuntu-latest }
           - { name: conda-windows-gallery-python3.12-ros3, python-ver: "3.12", os: windows-latest }
-          - { name: conda-macos-gallery-python3.12-ros3  , python-ver: "3.12", os: macos-13 } # This is due to DANDI not supporting osx-arm64. Will support macos-latest when this changes.
+          - { name: conda-macos-gallery-python3.12-ros3  , python-ver: "3.12", os: macos-latest }
     steps:
       - name: Cancel non-latest runs
         uses: styfle/[email protected]
@@ -273,7 +275,6 @@ jobs:
 
       - name: Install run dependencies
         run: |
-          pip install matplotlib
           pip install .
           pip list
 

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
@@ -24,6 +24,7 @@ jobs:
           - { name: linux-python3.12-upgraded    , test-tox-env: py312-upgraded  , build-tox-env: build-py312-upgraded , python-ver: "3.12", os: ubuntu-latest , upload-wheels: true }
           - { name: windows-python3.8-minimum    , test-tox-env: py38-minimum    , build-tox-env: build-py38-minimum   , python-ver: "3.8" , os: windows-latest }
           - { name: windows-python3.12-upgraded  , test-tox-env: py312-upgraded  , build-tox-env: build-py312-upgraded , python-ver: "3.12", os: windows-latest }
+          # minimum versions of dependencies do not have wheels or cannot be built on macos-arm64
           - { name: macos-python3.8-minimum      , test-tox-env: py38-minimum    , build-tox-env: build-py38-minimum   , python-ver: "3.8" , os: macos-13 }
     steps:
       - name: Cancel non-latest runs

diff --git a/environment-ros3.yml b/environment-ros3.yml
@@ -6,17 +6,18 @@ channels:
 dependencies:
   - python==3.12
   - h5py==3.11.0
-  - hdmf==3.14.0
+  - hdmf==3.14.1
   - matplotlib==3.8.0
   - numpy==1.26.4
   - pandas==2.2.2
   - python-dateutil==2.9.0
   - setuptools
-  - pytest==7.4.3 # This is for the upcoming pytest update
-  - dandi==0.60.0  # NOTE: dandi does not support osx-arm64
-  - fsspec==2024.2.0
-  - requests==2.31.0
-  - aiohttp==3.9.3
+  - pytest==7.4.3  # pin to pytest < 8 because of incompatibilities to be addressed
+  - fsspec==2024.6.0
+  - requests==2.32.3
+  - aiohttp==3.9.5
   - pip
   - pip:
-    - remfile==0.1.11
+    - remfile==0.1.13
+    - dandi==0.62.1  # NOTE: dandi is not available on conda for osx-arm64
+