From 26d51bb5c51eaf01642f4abd4b4cae29fbb88c91 Mon Sep 17 00:00:00 2001 From: Ross Barnowski Date: Wed, 6 Sep 2023 22:20:39 -0700 Subject: [PATCH 1/3] Synchronize with deepcell pins and rm upper bounds. --- requirements.txt | 6 +++--- setup.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0cffede..be004ec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -pandas>=1,<2 +pandas<2 numpy>=1.16.6 scipy>=1.2.3,<2 -scikit-image>=0.14.5 -scikit-learn>=0.20.4,<1 +scikit-image>=0.19.3 +scikit-learn tensorflow~=2.8.0 # manually matched to deepcell-tf jupyter>=1.0.0,<2 networkx>=2.1 diff --git a/setup.py b/setup.py index f256082..9042b41 100644 --- a/setup.py +++ b/setup.py @@ -52,11 +52,11 @@ long_description=readme, long_description_content_type='text/markdown', install_requires=[ - 'pandas>=1,<2', + 'pandas<2', 'numpy>=1.16.6', 'scipy>=1.2.3,<2', - 'scikit-image>=0.14.5', - 'scikit-learn>=0.20.4,<1', + 'scikit-image>=0.19.3', + 'scikit-learn', 'tensorflow~=2.8.0', 'jupyter>=1.0.0,<2', 'networkx>=2.1', From e904f703bd624e4f3369a8f4894fa2cc77e56f5b Mon Sep 17 00:00:00 2001 From: Ross Barnowski Date: Wed, 6 Sep 2023 22:33:32 -0700 Subject: [PATCH 2/3] Unpin trackpy. --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index be004ec..a975c32 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ jupyter>=1.0.0,<2 networkx>=2.1 opencv-python-headless<5 deepcell>=0.12.7 -trackpy~=0.4.2 +trackpy tqdm plotly statsmodels diff --git a/setup.py b/setup.py index 9042b41..00efd5f 100644 --- a/setup.py +++ b/setup.py @@ -63,7 +63,7 @@ 'opencv-python-headless<5', 'deepcell>=0.12.7', 'tqdm', - 'trackpy~=0.4.2', + 'trackpy', 'plotly', 'statsmodels', 'torch', From 2f382f26dab5cd41b388e3a5ab1d5aeb955b524e Mon Sep 17 00:00:00 2001 From: Ross Barnowski Date: Wed, 6 Sep 2023 22:44:58 -0700 Subject: [PATCH 3/3] Add Python 3.10 to testing matrix. --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 865c5b6..3bf5a09 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - python-version: [3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9, "3.10"] steps: - uses: actions/checkout@v3