From 10aae76a64de66d670fa112923ff70ad135729c3 Mon Sep 17 00:00:00 2001 From: Talmo Pereira Date: Tue, 1 Oct 2024 16:12:14 -0700 Subject: [PATCH] Pin ndx-pose<0.2.0 (#1978) * Pin ndx-pose<0.2.0 * Typo --- .conda/meta.yaml | 4 ++-- .conda_mac/meta.yaml | 4 ++-- environment.yml | 2 +- environment_mac.yml | 2 +- environment_no_cuda.yml | 2 +- pypi_requirements.txt | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.conda/meta.yaml b/.conda/meta.yaml index 30b0fc158..c1781a3ee 100644 --- a/.conda/meta.yaml +++ b/.conda/meta.yaml @@ -55,7 +55,7 @@ requirements: - conda-forge::seaborn - conda-forge::qudida - conda-forge::albumentations - - conda-forge::ndx-pose + - conda-forge::ndx-pose <0.2.0 - conda-forge::importlib-metadata ==4.11.4 run: - conda-forge::python ==3.7.12 # Run into _MAX_WINDOWS_WORKERS not found if < @@ -90,7 +90,7 @@ requirements: - conda-forge::tensorflow-hub <0.14.0 # Causes pynwb conflicts on linux GH-1446 - conda-forge::qudida - conda-forge::albumentations - - conda-forge::ndx-pose + - conda-forge::ndx-pose <0.2.0 - conda-forge::importlib-metadata ==4.11.4 # This no longer works so we have moved it to the build workflow diff --git a/.conda_mac/meta.yaml b/.conda_mac/meta.yaml index 403558f7c..8f773badf 100644 --- a/.conda_mac/meta.yaml +++ b/.conda_mac/meta.yaml @@ -57,7 +57,7 @@ requirements: - conda-forge::seaborn - conda-forge::qudida - conda-forge::albumentations - - conda-forge::ndx-pose + - conda-forge::ndx-pose <0.2.0 run: - conda-forge::python >=3.9.0, <3.10.0 @@ -89,7 +89,7 @@ requirements: # - conda-forge::tensorflow-hub # pulls in tensorflow cpu from conda-forge - conda-forge::qudida - conda-forge::albumentations - - conda-forge::ndx-pose + - conda-forge::ndx-pose <0.2.0 # test: # imports: diff --git a/environment.yml b/environment.yml index 06a0633d2..d8f752759 100644 --- a/environment.yml +++ b/environment.yml @@ -40,7 +40,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 index 9ab10a1b8..2026154fa 100644 --- a/environment_mac.yml +++ b/environment_mac.yml @@ -39,6 +39,6 @@ dependencies: # - conda-forge::tensorflow-hub # pulls in tensorflow cpu from conda-forge - conda-forge::qudida - conda-forge::albumentations - - conda-forge::ndx-pose + - conda-forge::ndx-pose <0.2.0 - pip: - "--editable=.[conda_dev]" \ No newline at end of file diff --git a/environment_no_cuda.yml b/environment_no_cuda.yml index ba2b54a22..721c27fca 100644 --- a/environment_no_cuda.yml +++ b/environment_no_cuda.yml @@ -41,7 +41,7 @@ dependencies: - conda-forge::tensorflow-hub - conda-forge::qudida - conda-forge::albumentations - - conda-forge::ndx-pose + - conda-forge::ndx-pose <0.2.0 - pip: - "--editable=.[conda_dev]" \ No newline at end of file diff --git a/pypi_requirements.txt b/pypi_requirements.txt index ad34e2ad8..775ce584e 100644 --- a/pypi_requirements.txt +++ b/pypi_requirements.txt @@ -37,7 +37,7 @@ tensorflow>=2.6.3,<2.9; platform_machine != 'arm64' # tensorflow ==2.7.4; platform_machine != 'arm64' tensorflow-hub<=0.14.0 albumentations -ndx-pose +ndx-pose<0.2.0 # These dependencies are untested since we do not offer a wheel for apple silicon atm. tensorflow-macos==2.9.2; sys_platform == 'darwin' and platform_machine == 'arm64' tensorflow-metal==0.5.0; sys_platform == 'darwin' and platform_machine == 'arm64'