From 1d2972e4d4ca49c3e3b6d23d8df19e8a3dbbecdb Mon Sep 17 00:00:00 2001 From: Marcus Fedarko Date: Wed, 19 Oct 2022 20:29:48 -0700 Subject: [PATCH] Fix build (#323) * BLD: pin black to >= 22.3.0 see https://github.com/psf/black/pull/2966 * STY: line length - flake8 * BLD: pin scipy < 1.9.0 https://github.com/biocore/scikit-bio/issues/1818 --- qurro/tests/test_integration_matching.py | 4 ++-- setup.py | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/qurro/tests/test_integration_matching.py b/qurro/tests/test_integration_matching.py index dea95a71..4930e083 100644 --- a/qurro/tests/test_integration_matching.py +++ b/qurro/tests/test_integration_matching.py @@ -40,9 +40,9 @@ def test_dropping_all_samples(): def test_dropping_all_samples_and_features(): - """Tests Qurro's behavior when > 0 feature(s) and all samples are unsupported. + """Tests Qurro when > 0 feature(s) & all samples are unsupported. - In particular, qurro should just throw an error about the + In particular, Qurro should just throw an error about the feature(s) being unsupported -- the feature check should come before the sample check (not for any particular reason, that's just how I wrote the code). diff --git a/setup.py b/setup.py index 1c1ae49a..0a712d01 100644 --- a/setup.py +++ b/setup.py @@ -88,6 +88,10 @@ # SparseDataFrame is dead, long live DataFrame "pandas >= 1", "scikit-bio > 0.5.3", + # Due to scikit-bio problems -- pinning to < 1.9.0. Should be hopefully + # fixed when a new scikit-bio release comes out. + # (https://github.com/biocore/scikit-bio/issues/1818) + "scipy >= 1.3.0, < 1.9.0", ], # Based on how Altair splits up its requirements: # https://github.com/altair-viz/altair/blob/master/setup.py @@ -96,7 +100,9 @@ "pytest >= 4.2", "pytest-cov >= 2.0", "flake8", - "black", + # If we don't pin black to being at least 22.3.0, then it and click + # will conflict w/ an error: https://github.com/psf/black/pull/2966 + "black >= 22.3.0", "nbconvert", ] },