Merge branch 'develop' into elizabeth/update-python-and-dependencies

talmolab · Oct 2, 2024 · e06db9d · e06db9d
2 parents 95ba6ac + 10aae76
commit e06db9d
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.conda/meta.yaml b/.conda/meta.yaml
@@ -57,7 +57,7 @@ requirements:
     - conda-forge::tensorflow-hub
     - conda-forge::qudida
     - conda-forge::albumentations
-    - conda-forge::ndx-pose
+    - conda-forge::ndx-pose <0.2.0
     - conda-forge::importlib-metadata
   run:
     - conda-forge::python >=3.10.0,<3.11.0
@@ -92,7 +92,7 @@ requirements:
     - conda-forge::tensorflow-hub
     - conda-forge::qudida
     - conda-forge::albumentations
-    - conda-forge::ndx-pose
+    - conda-forge::ndx-pose <0.2.0
     - conda-forge::importlib-metadata
 
 test:

diff --git a/.conda_mac/meta.yaml b/.conda_mac/meta.yaml
@@ -57,7 +57,7 @@ requirements:
     - sleap-deps::tensorflow ==2.12.0
     - conda-forge::qudida
     - conda-forge::albumentations
-    - conda-forge::ndx-pose
+    - conda-forge::ndx-pose <0.2.0
 
   run:
     - conda-forge::python >=3.10.0,<3.11.0
@@ -88,4 +88,4 @@ requirements:
     - sleap-deps::tensorflow ==2.12.0
     - conda-forge::qudida
     - conda-forge::albumentations
-    - conda-forge::ndx-pose
+    - conda-forge::ndx-pose <0.2.0
diff --git a/environment.yml b/environment.yml
@@ -41,7 +41,7 @@ dependencies:
     - conda-forge::tensorflow-hub # Pinned in meta.yml, but no problems here... yet
     - conda-forge::qudida
     - conda-forge::albumentations
-    - conda-forge::ndx-pose
+    - conda-forge::ndx-pose <0.2.0
 
     # Packages required by tensorflow to find/use GPUs
     - conda-forge::cudatoolkit ==11.3.1

diff --git a/environment_mac.yml b/environment_mac.yml
@@ -39,6 +39,6 @@ dependencies:
     - sleap-deps::tensorflow ==2.12.0
     - conda-forge::qudida
     - conda-forge::albumentations
-    - conda-forge::ndx-pose
+    - conda-forge::ndx-pose <0.2.0
     - pip:
           - "--editable=.[conda_dev]"
diff --git a/environment_no_cuda.yml b/environment_no_cuda.yml
@@ -41,7 +41,7 @@ dependencies:
     - conda-forge::tensorflow-hub # Pinned in meta.yml, but no problems here... yet
     - conda-forge::qudida
     - conda-forge::albumentations
-    - conda-forge::ndx-pose
+    - conda-forge::ndx-pose <0.2.0
 
     - pip:
           - "--editable=.[conda_dev]"
diff --git a/pypi_requirements.txt b/pypi_requirements.txt
@@ -31,7 +31,7 @@ seaborn
 tensorflow==2.9.2; platform_machine != 'arm64'
 tensorflow-hub
 albumentations
-ndx-pose
+ndx-pose<0.2.0
 # Silicon Mac specific packages
 tensorflow-macos >=2.10.0,<2.13.0; sys_platform == 'darwin' and platform_machine == 'arm64'
 tensorflow-metal; sys_platform == 'darwin' and platform_machine == 'arm64'