From eeaccc6a4928632f3b77ee7e4f6185d10724122f Mon Sep 17 00:00:00 2001 From: Martin Becker Date: Fri, 3 Jan 2025 15:34:07 +0100 Subject: [PATCH] Fix pre-commit --- requirements-deepcell-mac-arm64_tf210.txt | 22 +++++++++++----------- requirements-deepcell-mac-arm64_tf28.txt | 22 +++++++++++----------- tests/test_6_patch_proximity_analysis.py | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/requirements-deepcell-mac-arm64_tf210.txt b/requirements-deepcell-mac-arm64_tf210.txt index 4382496..04c0d2b 100644 --- a/requirements-deepcell-mac-arm64_tf210.txt +++ b/requirements-deepcell-mac-arm64_tf210.txt @@ -1,9 +1,4 @@ -# Protobuf version override needed because -# the older packages have older compiled protobufs… -protobuf<3.20 - -tensorflow-macos==2.10.0 -tensorflow-metal==0.6.0 +cellpose==3.0.8 # Things we need dependencies for # smart_open[gcs] @@ -11,17 +6,22 @@ tensorflow-metal==0.6.0 # DeepCell requirements deepcell-toolbox>=0.12.1 deepcell-tracking~=0.6.5 -scipy>=1.2.3,<2 -scikit-image>=0.19.3 # scikit-learn>=0.20.4 # tensorflow_addons~=0.16.1 # spektral~=1.0.4 jupyterlab -matplotlib # added for basic SPACEc functionality leidenalg louvain -spektral +matplotlib +# Protobuf version override needed because +# the older packages have older compiled protobufs… +protobuf<3.20 pydot==1.4.2 -cellpose==3.0.8 \ No newline at end of file +scikit-image>=0.19.3 +scipy>=1.2.3,<2 +spektral + +tensorflow-macos==2.10.0 +tensorflow-metal==0.6.0 diff --git a/requirements-deepcell-mac-arm64_tf28.txt b/requirements-deepcell-mac-arm64_tf28.txt index 66d43f1..047b8b4 100644 --- a/requirements-deepcell-mac-arm64_tf28.txt +++ b/requirements-deepcell-mac-arm64_tf28.txt @@ -1,9 +1,4 @@ -# Protobuf version override needed because -# the older packages have older compiled protobufs… -protobuf==3.20.3 - -tensorflow-macos==2.8.0 -tensorflow-metal==0.4.0 +cellpose==3.0.8 # Things we need dependencies for # smart_open[gcs] @@ -11,17 +6,22 @@ tensorflow-metal==0.4.0 # DeepCell requirements deepcell-toolbox>=0.12.1 deepcell-tracking~=0.6.5 -scipy>=1.2.3,<2 -scikit-image>=0.19.3 # scikit-learn>=0.20.4 # tensorflow_addons~=0.16.1 # spektral~=1.0.4 jupyterlab -matplotlib # added for basic SPACEc functionality leidenalg louvain -spektral +matplotlib +# Protobuf version override needed because +# the older packages have older compiled protobufs… +protobuf==3.20.3 pydot==1.4.2 -cellpose==3.0.8 +scikit-image>=0.19.3 +scipy>=1.2.3,<2 +spektral + +tensorflow-macos==2.8.0 +tensorflow-metal==0.4.0 diff --git a/tests/test_6_patch_proximity_analysis.py b/tests/test_6_patch_proximity_analysis.py index 648d8bc..29d256e 100644 --- a/tests/test_6_patch_proximity_analysis.py +++ b/tests/test_6_patch_proximity_analysis.py @@ -124,7 +124,7 @@ def test_6_patch_proximity_analysis(): subset_column="condition", subset_condition="tonsil", title="Tonsil patch proximity analysis", - savefig=None + savefig=None, )