From a4d2da856d7a613c07e202bd853c50190f0fb3da Mon Sep 17 00:00:00 2001 From: roomrys <38435167+roomrys@users.noreply.github.com> Date: Mon, 11 Sep 2023 13:39:40 -0700 Subject: [PATCH 01/13] Add version restrictions to tensorflow for pypi --- pypi_requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pypi_requirements.txt b/pypi_requirements.txt index b18637c37..93b0b7555 100644 --- a/pypi_requirements.txt +++ b/pypi_requirements.txt @@ -31,5 +31,7 @@ scikit-image scikit-learn ==1.0.* scikit-video seaborn -tensorflow +tensorflow>=2.6.3,<2.9.0; platform_machine != 'arm64' tensorflow-hub +tensorflow-macos==2.9.2; sys_platform == 'darwin' and platform_machine == 'arm64' +tensorflow-metal==0.5.0; sys_platform == 'darwin' and platform_machine == 'arm64' From d32b566a5030883ea013a878f7b798d4b888e3e9 Mon Sep 17 00:00:00 2001 From: roomrys Date: Mon, 11 Sep 2023 14:07:24 -0700 Subject: [PATCH 02/13] Bump to 1.3.3 --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- docs/conf.py | 4 ++-- docs/installation.md | 6 +++--- sleap/version.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 24c20c513..8c95f28dc 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -28,7 +28,7 @@ Please include information about how you installed. - OS: - Version(s): - + - SLEAP installation method (listed [here](https://sleap.ai/installation.html#)): - [ ] [Conda from package](https://sleap.ai/installation.html#conda-package) - [ ] [Conda from source](https://sleap.ai/installation.html#conda-from-source) diff --git a/docs/conf.py b/docs/conf.py index b1e79fcc3..572e73ea0 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -28,7 +28,7 @@ copyright = f"2019–{date.today().year}, Talmo Lab" # The short X.Y version -version = "1.3.2" +version = "1.3.3" # Get the sleap version # with open("../sleap/version.py") as f: @@ -36,7 +36,7 @@ # version = re.search("\d.+(?=['\"])", version_file).group(0) # Release should be the full branch name -release = "v1.3.2" +release = "v1.3.3" html_title = f"SLEAP ({release})" html_short_title = "SLEAP" diff --git a/docs/installation.md b/docs/installation.md index ee9dad1ea..8083d1346 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -137,13 +137,13 @@ SLEAP can be installed three different ways: via {ref}`conda package Date: Mon, 11 Sep 2023 14:15:44 -0700 Subject: [PATCH 03/13] Change to prerelease version, advise 1.3.1 pypi installation --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- docs/conf.py | 4 ++-- docs/installation.md | 6 +++--- sleap/version.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 8c95f28dc..2f3a072ad 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -28,7 +28,7 @@ Please include information about how you installed. - OS: - Version(s): - + - SLEAP installation method (listed [here](https://sleap.ai/installation.html#)): - [ ] [Conda from package](https://sleap.ai/installation.html#conda-package) - [ ] [Conda from source](https://sleap.ai/installation.html#conda-from-source) diff --git a/docs/conf.py b/docs/conf.py index 572e73ea0..9289b2111 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -28,7 +28,7 @@ copyright = f"2019–{date.today().year}, Talmo Lab" # The short X.Y version -version = "1.3.3" +version = "1.3.3a0" # Get the sleap version # with open("../sleap/version.py") as f: @@ -36,7 +36,7 @@ # version = re.search("\d.+(?=['\"])", version_file).group(0) # Release should be the full branch name -release = "v1.3.3" +release = "v1.3.3a0" html_title = f"SLEAP ({release})" html_short_title = "SLEAP" diff --git a/docs/installation.md b/docs/installation.md index 8083d1346..193cb3935 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -137,13 +137,13 @@ SLEAP can be installed three different ways: via {ref}`conda package Date: Mon, 11 Sep 2023 14:39:19 -0700 Subject: [PATCH 04/13] Change version back req release 1.3.3, advise 1.3.3 pip install --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- docs/conf.py | 4 ++-- docs/notebooks/Data_structures.ipynb | 2 +- docs/notebooks/Interactive_and_realtime_inference.ipynb | 2 +- docs/notebooks/Interactive_and_resumable_training.ipynb | 2 +- docs/notebooks/Model_evaluation.ipynb | 2 +- docs/notebooks/Post_inference_tracking.ipynb | 2 +- .../Training_and_inference_on_an_example_dataset.ipynb | 2 +- .../notebooks/Training_and_inference_using_Google_Drive.ipynb | 2 +- sleap/version.py | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 2f3a072ad..8c95f28dc 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -28,7 +28,7 @@ Please include information about how you installed. - OS: - Version(s): - + - SLEAP installation method (listed [here](https://sleap.ai/installation.html#)): - [ ] [Conda from package](https://sleap.ai/installation.html#conda-package) - [ ] [Conda from source](https://sleap.ai/installation.html#conda-from-source) diff --git a/docs/conf.py b/docs/conf.py index 9289b2111..572e73ea0 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -28,7 +28,7 @@ copyright = f"2019–{date.today().year}, Talmo Lab" # The short X.Y version -version = "1.3.3a0" +version = "1.3.3" # Get the sleap version # with open("../sleap/version.py") as f: @@ -36,7 +36,7 @@ # version = re.search("\d.+(?=['\"])", version_file).group(0) # Release should be the full branch name -release = "v1.3.3a0" +release = "v1.3.3" html_title = f"SLEAP ({release})" html_short_title = "SLEAP" diff --git a/docs/notebooks/Data_structures.ipynb b/docs/notebooks/Data_structures.ipynb index a3337186c..f1698816b 100644 --- a/docs/notebooks/Data_structures.ipynb +++ b/docs/notebooks/Data_structures.ipynb @@ -56,7 +56,7 @@ "source": [ "# This should take care of all the dependencies on colab:\n", "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n", - "!pip install -qqq sleap==1.3.1111\n", + "!pip install -qqq sleap[pypi]>=1.3.3\n", "\n", "# But to do it locally, we'd recommend the conda package (available on Windows + Linux):\n", "# conda create -n sleap -c sleap -c conda-forge -c nvidia sleap" diff --git a/docs/notebooks/Interactive_and_realtime_inference.ipynb b/docs/notebooks/Interactive_and_realtime_inference.ipynb index 5d9c7e33d..d5cb9a029 100644 --- a/docs/notebooks/Interactive_and_realtime_inference.ipynb +++ b/docs/notebooks/Interactive_and_realtime_inference.ipynb @@ -60,7 +60,7 @@ "source": [ "# This should take care of all the dependencies on colab:\n", "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n", - "!pip install -qqq sleap==1.3.1\n", + "!pip install -qqq sleap[pypi]>=1.3.3\n", "\n", "\n", "# But to do it locally, we'd recommend the conda package (available on Windows + Linux):\n", diff --git a/docs/notebooks/Interactive_and_resumable_training.ipynb b/docs/notebooks/Interactive_and_resumable_training.ipynb index be82c19a5..de4d23189 100644 --- a/docs/notebooks/Interactive_and_resumable_training.ipynb +++ b/docs/notebooks/Interactive_and_resumable_training.ipynb @@ -62,7 +62,7 @@ "source": [ "# This should take care of all the dependencies on colab:\n", "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n", - "!pip install -qqq sleap==1.3.1\n", + "!pip install -qqq sleap[pypi]>=1.3.3\n", "\n", "\n", "# But to do it locally, we'd recommend the conda package (available on Windows + Linux):\n", diff --git a/docs/notebooks/Model_evaluation.ipynb b/docs/notebooks/Model_evaluation.ipynb index 62bf3935a..2e68f1831 100644 --- a/docs/notebooks/Model_evaluation.ipynb +++ b/docs/notebooks/Model_evaluation.ipynb @@ -40,7 +40,7 @@ ], "source": [ "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n", - "!pip install -qqq sleap==1.3.1\n", + "!pip install -qqq sleap[pypi]>=1.3.3\n", "!apt -qq install tree\n", "!wget -q https://storage.googleapis.com/sleap-data/reference/flies13/td_fast.210505_012601.centered_instance.n%3D1800.zip\n", "!unzip -qq -o -d \"td_fast.210505_012601.centered_instance.n=1800\" \"td_fast.210505_012601.centered_instance.n=1800.zip\"" diff --git a/docs/notebooks/Post_inference_tracking.ipynb b/docs/notebooks/Post_inference_tracking.ipynb index 106c7ae88..6d64bb193 100644 --- a/docs/notebooks/Post_inference_tracking.ipynb +++ b/docs/notebooks/Post_inference_tracking.ipynb @@ -61,7 +61,7 @@ "source": [ "# This should take care of all the dependencies on colab:\n", "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n", - "!pip install -qqq sleap==1.3.1\n", + "!pip install -qqq sleap[pypi]>=1.3.3\n", "\n", "# But to do it locally, we'd recommend the conda package (available on Windows + Linux):\n", "# conda create -n sleap -c sleap -c conda-forge -c nvidia sleap" diff --git a/docs/notebooks/Training_and_inference_on_an_example_dataset.ipynb b/docs/notebooks/Training_and_inference_on_an_example_dataset.ipynb index 22c4193f7..25312328d 100644 --- a/docs/notebooks/Training_and_inference_on_an_example_dataset.ipynb +++ b/docs/notebooks/Training_and_inference_on_an_example_dataset.ipynb @@ -62,7 +62,7 @@ ], "source": [ "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n", - "!pip install -qqq sleap==1.3.1" + "!pip install -qqq sleap[pypi]>=1.3.3" ] }, { diff --git a/docs/notebooks/Training_and_inference_using_Google_Drive.ipynb b/docs/notebooks/Training_and_inference_using_Google_Drive.ipynb index 96374982d..39e46d2c3 100644 --- a/docs/notebooks/Training_and_inference_using_Google_Drive.ipynb +++ b/docs/notebooks/Training_and_inference_using_Google_Drive.ipynb @@ -59,7 +59,7 @@ ], "source": [ "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n", - "!pip install -qqq sleap==1.3.1" + "!pip install -qqq sleap[pypi]>=1.3.3" ] }, { diff --git a/sleap/version.py b/sleap/version.py index 72476648b..437e17fba 100644 --- a/sleap/version.py +++ b/sleap/version.py @@ -12,7 +12,7 @@ """ -__version__ = "1.3.3a0" +__version__ = "1.3.3" def versions(): From 42ab44119b165b8ae2bd39b531983074216a97e0 Mon Sep 17 00:00:00 2001 From: roomrys Date: Mon, 11 Sep 2023 14:42:16 -0700 Subject: [PATCH 05/13] Advise 1.3.3 pip install --- docs/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation.md b/docs/installation.md index 193cb3935..48211d52f 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -232,7 +232,7 @@ Although you do not need Mambaforge installed to perform a `pip install`, we rec 3. Finally, we can perform the `pip install`: ```bash - pip install sleap==1.3.1 + pip install sleap[pypi]==1.3.3 ``` This works on **any OS except Apple silicon** and on **Google Colab**. From 3ec76be871806e8ba405ffd7bd8ba446a73877d0 Mon Sep 17 00:00:00 2001 From: roomrys Date: Tue, 12 Sep 2023 16:11:22 -0700 Subject: [PATCH 06/13] Get GUI working on Linux --- pypi_requirements.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pypi_requirements.txt b/pypi_requirements.txt index 93b0b7555..58b37c3cb 100644 --- a/pypi_requirements.txt +++ b/pypi_requirements.txt @@ -31,7 +31,13 @@ scikit-image scikit-learn ==1.0.* scikit-video seaborn -tensorflow>=2.6.3,<2.9.0; platform_machine != 'arm64' -tensorflow-hub +tensorflow>=2.6.3,<2.11; sys_platform == "win32" and platform_machine != 'arm64' +tensorflow>=2.6.3,<=2.11; sys_platform != "win32" and platform_machine != 'arm64' +tensorflow-hub<=0.14.0 tensorflow-macos==2.9.2; sys_platform == 'darwin' and platform_machine == 'arm64' tensorflow-metal==0.5.0; sys_platform == 'darwin' and platform_machine == 'arm64' + +# Dependencies of dependencies +# tensorboard 2.11.2 has requirement protobuf<4,>=3.9.2 +# tensorflow 2.11.0 has requirement protobuf<3.20,>=3.9.2 +protobuf<3.20 \ No newline at end of file From bd8e335595cee2347087d0bd5003a5580fc2cfd8 Mon Sep 17 00:00:00 2001 From: roomrys Date: Tue, 12 Sep 2023 16:21:10 -0700 Subject: [PATCH 07/13] Add comments --- pypi_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pypi_requirements.txt b/pypi_requirements.txt index 58b37c3cb..d0e1c9021 100644 --- a/pypi_requirements.txt +++ b/pypi_requirements.txt @@ -12,7 +12,6 @@ jsonpickle==1.2 networkx numpy>=1.19.5,<1.23.0 opencv-python>=4.2.0,<=4.6.0 -# opencv-python-headless>=4.2.0.34,<=4.5.5.62 pandas pillow>=8.3.1,<=8.4.0 psutil @@ -34,6 +33,7 @@ seaborn tensorflow>=2.6.3,<2.11; sys_platform == "win32" and platform_machine != 'arm64' tensorflow>=2.6.3,<=2.11; sys_platform != "win32" and platform_machine != 'arm64' tensorflow-hub<=0.14.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' From 1f69080eb93e1aad78f3316a8978e3cfc0ebeb2f Mon Sep 17 00:00:00 2001 From: roomrys <38435167+roomrys@users.noreply.github.com> Date: Wed, 13 Sep 2023 00:11:58 -0700 Subject: [PATCH 08/13] Get GUI working on Windows --- pypi_requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pypi_requirements.txt b/pypi_requirements.txt index d0e1c9021..c1c475920 100644 --- a/pypi_requirements.txt +++ b/pypi_requirements.txt @@ -18,7 +18,9 @@ psutil pykalman==0.9.5 PySide2>=5.13.2,<=5.14.1; platform_machine != 'arm64' PySide6; sys_platform == 'darwin' and platform_machine == 'arm64' -python-rapidjson +# Otherwise error: Microsoft Visual C++ 14.0 is required. +python-rapidjson <=1.10; sys_platform == 'win32' +python-rapidjson; sys_platform != 'win32' pyyaml pyzmq qtpy>=2.0.1 From 9ad9e6bc112e3de538896f8b0a85b490a00798d4 Mon Sep 17 00:00:00 2001 From: roomrys <38435167+roomrys@users.noreply.github.com> Date: Wed, 13 Sep 2023 14:33:05 -0700 Subject: [PATCH 09/13] Get inference working on windows --- pypi_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pypi_requirements.txt b/pypi_requirements.txt index c1c475920..ecc4755e5 100644 --- a/pypi_requirements.txt +++ b/pypi_requirements.txt @@ -32,7 +32,7 @@ scikit-image scikit-learn ==1.0.* scikit-video seaborn -tensorflow>=2.6.3,<2.11; sys_platform == "win32" and platform_machine != 'arm64' +tensorflow>=2.6.3,<2.9; sys_platform == "win32" tensorflow>=2.6.3,<=2.11; sys_platform != "win32" and platform_machine != 'arm64' tensorflow-hub<=0.14.0 # These dependencies are untested since we do not offer a wheel for apple silicon atm. From 8db46b453b61526981d28ca0fd5b994b4c7ebec0 Mon Sep 17 00:00:00 2001 From: roomrys <38435167+roomrys@users.noreply.github.com> Date: Wed, 13 Sep 2023 16:18:44 -0700 Subject: [PATCH 10/13] Restrict urllib3 range (non-blocking error in installation) --- pypi_requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pypi_requirements.txt b/pypi_requirements.txt index ecc4755e5..25664e08d 100644 --- a/pypi_requirements.txt +++ b/pypi_requirements.txt @@ -40,6 +40,8 @@ tensorflow-macos==2.9.2; sys_platform == 'darwin' and platform_machine == 'arm64 tensorflow-metal==0.5.0; sys_platform == 'darwin' and platform_machine == 'arm64' # Dependencies of dependencies +# google-auth 2.23.0 has requirement urllib3<2.0 +urllib3<2.0 # Not a 'noticed' runtime-dependency # tensorboard 2.11.2 has requirement protobuf<4,>=3.9.2 # tensorflow 2.11.0 has requirement protobuf<3.20,>=3.9.2 -protobuf<3.20 \ No newline at end of file +protobuf<3.20 # Makes GUI work in windows \ No newline at end of file From 034e58be7e06497aeeda9a434ae3b907e6de9a53 Mon Sep 17 00:00:00 2001 From: roomrys Date: Thu, 14 Sep 2023 09:10:32 -0700 Subject: [PATCH 11/13] Get training/inference working on linux minimal environment --- pypi_requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pypi_requirements.txt b/pypi_requirements.txt index 25664e08d..eb4d63076 100644 --- a/pypi_requirements.txt +++ b/pypi_requirements.txt @@ -32,8 +32,7 @@ scikit-image scikit-learn ==1.0.* scikit-video seaborn -tensorflow>=2.6.3,<2.9; sys_platform == "win32" -tensorflow>=2.6.3,<=2.11; sys_platform != "win32" and platform_machine != 'arm64' +tensorflow>=2.6.3,<2.9; platform_machine != 'arm64' tensorflow-hub<=0.14.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' From 33fca44406ed4b88fefd63c5d037944000ca26f0 Mon Sep 17 00:00:00 2001 From: roomrys <38435167+roomrys@users.noreply.github.com> Date: Fri, 15 Sep 2023 15:46:08 -0700 Subject: [PATCH 12/13] Put quotes around sleap install --- docs/notebooks/Interactive_and_resumable_training.ipynb | 2 +- docs/notebooks/Model_evaluation.ipynb | 2 +- docs/notebooks/Post_inference_tracking.ipynb | 2 +- .../Training_and_inference_on_an_example_dataset.ipynb | 2 +- docs/notebooks/Training_and_inference_using_Google_Drive.ipynb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/notebooks/Interactive_and_resumable_training.ipynb b/docs/notebooks/Interactive_and_resumable_training.ipynb index de4d23189..f30f036f3 100644 --- a/docs/notebooks/Interactive_and_resumable_training.ipynb +++ b/docs/notebooks/Interactive_and_resumable_training.ipynb @@ -62,7 +62,7 @@ "source": [ "# This should take care of all the dependencies on colab:\n", "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n", - "!pip install -qqq sleap[pypi]>=1.3.3\n", + "!pip install -qqq \"sleap[pypi]>=1.3.3\"\n", "\n", "\n", "# But to do it locally, we'd recommend the conda package (available on Windows + Linux):\n", diff --git a/docs/notebooks/Model_evaluation.ipynb b/docs/notebooks/Model_evaluation.ipynb index 2e68f1831..41ca6568c 100644 --- a/docs/notebooks/Model_evaluation.ipynb +++ b/docs/notebooks/Model_evaluation.ipynb @@ -40,7 +40,7 @@ ], "source": [ "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n", - "!pip install -qqq sleap[pypi]>=1.3.3\n", + "!pip install -qqq \"sleap[pypi]>=1.3.3\"\n", "!apt -qq install tree\n", "!wget -q https://storage.googleapis.com/sleap-data/reference/flies13/td_fast.210505_012601.centered_instance.n%3D1800.zip\n", "!unzip -qq -o -d \"td_fast.210505_012601.centered_instance.n=1800\" \"td_fast.210505_012601.centered_instance.n=1800.zip\"" diff --git a/docs/notebooks/Post_inference_tracking.ipynb b/docs/notebooks/Post_inference_tracking.ipynb index 6d64bb193..239176bdb 100644 --- a/docs/notebooks/Post_inference_tracking.ipynb +++ b/docs/notebooks/Post_inference_tracking.ipynb @@ -61,7 +61,7 @@ "source": [ "# This should take care of all the dependencies on colab:\n", "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n", - "!pip install -qqq sleap[pypi]>=1.3.3\n", + "!pip install -qqq \"sleap[pypi]>=1.3.3\"\n", "\n", "# But to do it locally, we'd recommend the conda package (available on Windows + Linux):\n", "# conda create -n sleap -c sleap -c conda-forge -c nvidia sleap" diff --git a/docs/notebooks/Training_and_inference_on_an_example_dataset.ipynb b/docs/notebooks/Training_and_inference_on_an_example_dataset.ipynb index 25312328d..b0211bbca 100644 --- a/docs/notebooks/Training_and_inference_on_an_example_dataset.ipynb +++ b/docs/notebooks/Training_and_inference_on_an_example_dataset.ipynb @@ -62,7 +62,7 @@ ], "source": [ "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n", - "!pip install -qqq sleap[pypi]>=1.3.3" + "!pip install -qqq \"sleap[pypi]>=1.3.3\"" ] }, { diff --git a/docs/notebooks/Training_and_inference_using_Google_Drive.ipynb b/docs/notebooks/Training_and_inference_using_Google_Drive.ipynb index 39e46d2c3..1e871861d 100644 --- a/docs/notebooks/Training_and_inference_using_Google_Drive.ipynb +++ b/docs/notebooks/Training_and_inference_using_Google_Drive.ipynb @@ -59,7 +59,7 @@ ], "source": [ "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n", - "!pip install -qqq sleap[pypi]>=1.3.3" + "!pip install -qqq \"sleap[pypi]>=1.3.3\"" ] }, { From 30c93b3dd6a9cd9ec9fac9389ea222f645a1af14 Mon Sep 17 00:00:00 2001 From: roomrys <38435167+roomrys@users.noreply.github.com> Date: Fri, 15 Sep 2023 15:51:35 -0700 Subject: [PATCH 13/13] Put quotes around sleap install --- docs/notebooks/Data_structures.ipynb | 2 +- docs/notebooks/Interactive_and_realtime_inference.ipynb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/notebooks/Data_structures.ipynb b/docs/notebooks/Data_structures.ipynb index f1698816b..ff0ea2d3d 100644 --- a/docs/notebooks/Data_structures.ipynb +++ b/docs/notebooks/Data_structures.ipynb @@ -56,7 +56,7 @@ "source": [ "# This should take care of all the dependencies on colab:\n", "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n", - "!pip install -qqq sleap[pypi]>=1.3.3\n", + "!pip install -qqq \"sleap[pypi]>=1.3.3\"\n", "\n", "# But to do it locally, we'd recommend the conda package (available on Windows + Linux):\n", "# conda create -n sleap -c sleap -c conda-forge -c nvidia sleap" diff --git a/docs/notebooks/Interactive_and_realtime_inference.ipynb b/docs/notebooks/Interactive_and_realtime_inference.ipynb index d5cb9a029..4a3b612a2 100644 --- a/docs/notebooks/Interactive_and_realtime_inference.ipynb +++ b/docs/notebooks/Interactive_and_realtime_inference.ipynb @@ -60,7 +60,7 @@ "source": [ "# This should take care of all the dependencies on colab:\n", "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n", - "!pip install -qqq sleap[pypi]>=1.3.3\n", + "!pip install -qqq \"sleap[pypi]>=1.3.3\"\n", "\n", "\n", "# But to do it locally, we'd recommend the conda package (available on Windows + Linux):\n",