Merge remote-tracking branch 'origin/elizabeth/change-TensorFlow-vers…

…ion-in-conda-package' into elizabeth/change-TensorFlow-version-in-conda-package

.conda_mac/meta.yaml

@@ -16,7 +16,7 @@ about:
   summary: {{ data.get('description') }}
 
 build:
-  number: 1
+  number: 0
 
 source:
   path: ../
@@ -54,6 +54,9 @@ requirements:
     - conda-forge::scikit-learn ==1.0
     - conda-forge::scikit-video
     - conda-forge::seaborn
+    - conda-forge::qudida
+    - conda-forge::albumentations
+    - conda-forge::ndx-pose
 
   run:
     - conda-forge::python ~=3.9
@@ -81,7 +84,10 @@ requirements:
     - conda-forge::scikit-learn ==1.0
     - conda-forge::scikit-video
     - conda-forge::seaborn
-    - conda-forge::tensorflow-hub
+    # - conda-forge::tensorflow-hub  # pulls in tensorflow cpu from conda-forge
+    - conda-forge::qudida
+    - conda-forge::albumentations
+    - conda-forge::ndx-pose
 
 test:
   imports:

.github/workflows/build.yml

@@ -13,13 +13,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-22.04", "windows-2022", "macos-latest"]
+        os: ["ubuntu-22.04", "windows-2022", "macos-14"]
         # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstrategymatrixinclude
         include:
           # Use this condarc as default
           - condarc: .conda/condarc.yaml
           # Use special condarc if macos
-          - os: "macos-latest"
+          - os: "macos-14"
             condarc: .conda_mac/condarc.yaml
     steps:
       # Setup
@@ -79,7 +79,7 @@ jobs:
 
       # Build conda package (Mac)
       - name: Build conda package (Mac)
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-14'
         shell: bash -l {0}
         run: |
           conda build .conda_mac --output-folder build
@@ -104,7 +104,7 @@ jobs:
       
       # Login to conda (Mac)
       - name: Login to Anaconda (Mac)
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-14'
         env:
           ANACONDA_LOGIN: ${{ secrets.ANACONDA_LOGIN }}
         shell: bash -l {0}
@@ -137,12 +137,12 @@ jobs:
       
       # Upload conda package (Mac)
       - name: Upload conda package (Mac/main)
-        if: matrix.os == 'macos-latest' && !github.event.release.prerelease
+        if: matrix.os == 'macos-14' && !github.event.release.prerelease
         shell: bash -l {0}
         run: |
           anaconda -v upload build/osx-64/*.tar.bz2 --label dev
       - name: Upload conda package (Mac/dev)
-        if: matrix.os == 'macos-latest' && github.event.release.prerelease
+        if: matrix.os == 'macos-14' && github.event.release.prerelease
         shell: bash -l {0}
         run: |
           anaconda -v upload build/osx-64/*.tar.bz2 --label dev

.github/workflows/ci.yml

@@ -65,13 +65,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-22.04", "windows-2022", "macos-latest"]
+        os: ["ubuntu-22.04", "windows-2022", "macos-14"]
         include:
           # Default values
           - env_file: environment_no_cuda.yml
           - test_args: --durations=-1 tests/
           # Mac specific values
-          - os: macos-latest
+          - os: macos-14
             env_file: environment_mac.yml
           # Ubuntu specific values
           - os: ubuntu-22.04

environment_mac.yml

@@ -9,12 +9,13 @@ channels:
 dependencies:
     # Packages SLEAP uses directly
     - conda-forge::attrs >=21.2.0
+    - conda-forge::importlib-metadata <7.1.0
     - conda-forge::cattrs ==1.1.1
     - conda-forge::h5py
     - conda-forge::jsmin
     - conda-forge::jsonpickle ==1.2
     - conda-forge::keras <2.10.0,>=2.9.0rc0  # Required by tensorflow-macos
-    - conda-forge::networkx
+    - conda-forge::networkx <3.3
     - anaconda::numpy >=1.19.5,<1.23.0
     - conda-forge::opencv
     - conda-forge::pandas
@@ -34,7 +35,7 @@ dependencies:
     - conda-forge::scikit-learn ==1.0
     - conda-forge::scikit-video
     - conda-forge::seaborn
-    - conda-forge::tensorflow-hub
+    # - conda-forge::tensorflow-hub  # pulls in tensorflow cpu from conda-forge
     - conda-forge::qudida
     - conda-forge::albumentations
     - conda-forge::ndx-pose