From 5aa410bb4d776eb79a3dd87e0241c918101200ef Mon Sep 17 00:00:00 2001 From: Benjamin Midtvedt Date: Thu, 6 Oct 2022 11:31:43 +0200 Subject: [PATCH 1/3] Add tensorflow datasets to the list of dependencies. --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6f54ac41a..19af6f923 100644 --- a/setup.py +++ b/setup.py @@ -8,6 +8,7 @@ required = [ "tensorflow", "tensorflow-probability", + "tensorflow_datasets", "numpy", "scipy", "pint", @@ -28,7 +29,7 @@ setuptools.setup( name="deeptrack", # Replace with your own username - version="1.4.0a8", + version="1.4.1", author="Benjamin Midtvedt", author_email="benjamin.midtvedt@physics.gu.se", description="A deep learning oriented microscopy image simulation package", From bfb0e03d6c4b2d230c26fa525de7b78df2ac3da1 Mon Sep 17 00:00:00 2001 From: Benjamin Midtvedt Date: Thu, 6 Oct 2022 11:37:21 +0200 Subject: [PATCH 2/3] Read requirements.txt into setup.py --- setup.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/setup.py b/setup.py index 19af6f923..dbba4caa9 100644 --- a/setup.py +++ b/setup.py @@ -1,27 +1,16 @@ import setuptools -import subprocess import pkg_resources with open("README.md", "r") as fh: long_description = fh.read() -required = [ - "tensorflow", - "tensorflow-probability", - "tensorflow_datasets", - "numpy", - "scipy", - "pint", - "pandas", - "tqdm", - "scikit-image>=0.18.0", - "pydeepimagej", - "more_itertools", -] +with open("requirements.txt", "r") as fh: + required = fh.read().splitlines() + installed = [pkg.key for pkg in pkg_resources.working_set] if ( - not "tensorflow" in installed + "tensorflow" not in installed or pkg_resources.working_set.by_key["tensorflow"].version[0] == "2" ): required.append("tensorflow_addons") From ecc509fcfceec80b2fcf51691d8e902d568f8e03 Mon Sep 17 00:00:00 2001 From: Benjamin Midtvedt Date: Thu, 6 Oct 2022 11:39:47 +0200 Subject: [PATCH 3/3] remove sphinx from build --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py index dbba4caa9..5c4a665f5 100644 --- a/setup.py +++ b/setup.py @@ -7,6 +7,10 @@ with open("requirements.txt", "r") as fh: required = fh.read().splitlines() +# Remove sphinx from requirements +required = [x for x in required if not x.startswith("Sphinx")] +required = [x for x in required if not x.startswith("pydata-sphinx-theme")] + installed = [pkg.key for pkg in pkg_resources.working_set] if (