diff --git a/requirements-deepcell-mac-arm64_tf213.txt b/requirements-deepcell-mac-arm64_tf213.txt deleted file mode 100644 index e035cf6..0000000 --- a/requirements-deepcell-mac-arm64_tf213.txt +++ /dev/null @@ -1,27 +0,0 @@ -cellpose==3.0.8 - -# Things we need dependencies for -# smart_open[gcs] - -# DeepCell requirements -deepcell-toolbox>=0.12.1 -deepcell-tracking~=0.6.5 -# scikit-learn>=0.20.4 -# tensorflow_addons~=0.16.1 -# spektral~=1.0.4 -jupyterlab - -# added for basic SPACEc functionality -leidenalg -louvain -matplotlib -# Protobuf version override needed because -# the older packages have older compiled protobufs… -# protobuf<3.20 -pydot==1.4.2 -scikit-image>=0.19.3 -scipy>=1.2.3,<2 -spektral - -tensorflow-macos==2.13.0 -# tensorflow diff --git a/tests/test_6_patch_proximity_analysis.py b/tests/test_6_patch_proximity_analysis.py index 655f008..ef24ad4 100644 --- a/tests/test_6_patch_proximity_analysis.py +++ b/tests/test_6_patch_proximity_analysis.py @@ -5,7 +5,7 @@ TEST_DIR = pathlib.Path(__file__).parent -@pytest.mark.slow +# @pytest.mark.slow def test_6_patch_proximity_analysis(): # Set up environment import matplotlib diff --git a/tox.ini b/tox.ini index 2362507..dc39443 100644 --- a/tox.ini +++ b/tox.ini @@ -8,6 +8,38 @@ envlist = default isolated_build = True +[testenv:platform-macos-metal] +description = Invoke pytest to run automated tests +allowlist_externals = + brew + echo +setenv = + TOXINIDIR = {toxinidir} + DYLD_LIBRARY_PATH = {env:DYLD_LIBRARY_PATH}{:}/opt/homebrew/Cellar/openslide/4.0.0/lib{:}/opt/homebrew/Cellar/vips/8.16.0/lib + TF_CPP_MIN_LOG_LEVEL = 2 + CUDA_VISIBLE_DEVICES = -1 +passenv = + HOME + SETUPTOOLS_* +extras = + testing +deps = + cffi +commands = + echo {env:DYLD_LIBRARY_PATH} + brew install vips + brew install graphviz + brew list openslide + brew list vips + pip install pyvips + pip install openslide-python + pip install -r requirements-deepcell-mac-arm64_tf210-metal.txt + pip install deepcell --no-deps + python --version + pip show tensorflow tensorflow-macos tensorflow-metal keras + pytest {posargs} + + [testenv:platform-macos] description = Invoke pytest to run automated tests allowlist_externals =