From 8589218a63c01d71c08129f354ac8f52bf19a5bc Mon Sep 17 00:00:00 2001 From: Ariel Rokem Date: Tue, 21 Mar 2023 15:53:10 -0700 Subject: [PATCH 1/5] Update black formatting for a few files. --- .pre-commit-config.yaml | 2 +- afqinsight/cnn.py | 1 - afqinsight/tests/test_bagging.py | 1 - afqinsight/tests/test_cnn.py | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b17d1dbd..3e6fa4bc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,4 +3,4 @@ repos: rev: 22.3.0 hooks: - id: black - language_version: python3.8 + language_version: python diff --git a/afqinsight/cnn.py b/afqinsight/cnn.py index c32207af..16f03fd3 100644 --- a/afqinsight/cnn.py +++ b/afqinsight/cnn.py @@ -141,7 +141,6 @@ def __init__( project_name=None, **tuner_kwargs, ): - self.tuner_type = tuner_type self.layers = layers self.input_shape = input_shape diff --git a/afqinsight/tests/test_bagging.py b/afqinsight/tests/test_bagging.py index a89fdd7a..4612e1db 100644 --- a/afqinsight/tests/test_bagging.py +++ b/afqinsight/tests/test_bagging.py @@ -213,7 +213,6 @@ def fit(self, X, y): X_train_sparse = sparse_format(X_train) X_test_sparse = sparse_format(X_test) for params in parameter_sets: - # Trained on sparse format sparse_classifier = SerialBaggingRegressor( base_estimator=CustomSVR(), random_state=1, **params diff --git a/afqinsight/tests/test_cnn.py b/afqinsight/tests/test_cnn.py index 10898ffd..8899d912 100644 --- a/afqinsight/tests/test_cnn.py +++ b/afqinsight/tests/test_cnn.py @@ -150,7 +150,6 @@ def test_random_cnn(): def test_fail_cnn(): - with pytest.raises(ValueError): # passing in wrong shape of X (not 2d): model = CNN(100, 6, 5, 64) From 958767c3047c8234c3e81c07795820ef401a76f9 Mon Sep 17 00:00:00 2001 From: Ariel Rokem Date: Thu, 9 Mar 2023 15:57:45 -0800 Subject: [PATCH 2/5] Updates soon-to-be-deprecated Seaborn API --- afqinsight/plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afqinsight/plot.py b/afqinsight/plot.py index aa746cde..0f76865f 100644 --- a/afqinsight/plot.py +++ b/afqinsight/plot.py @@ -263,7 +263,7 @@ def plot_tract_profiles( y=metric, hue=hue, data=df_stat, - ci=ci, + errorbar=('ci', 95.0), palette=palette, ax=ax, linewidth=1.0, From b9539908b4f394e1a83a830eb1959ab38bf0cbb5 Mon Sep 17 00:00:00 2001 From: Ariel Rokem Date: Tue, 21 Mar 2023 15:58:11 -0700 Subject: [PATCH 3/5] Use black's favorite quote style. --- afqinsight/plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afqinsight/plot.py b/afqinsight/plot.py index 0f76865f..37ed2419 100644 --- a/afqinsight/plot.py +++ b/afqinsight/plot.py @@ -263,7 +263,7 @@ def plot_tract_profiles( y=metric, hue=hue, data=df_stat, - errorbar=('ci', 95.0), + errorbar=("ci", 95.0), palette=palette, ax=ax, linewidth=1.0, From 69a4c589e76115e3c74c8f54f91d377db21ad717 Mon Sep 17 00:00:00 2001 From: Ariel Rokem Date: Mon, 27 Mar 2023 10:57:07 -0700 Subject: [PATCH 4/5] Update groupyr dependency. --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index feca5487..d7ae6b0d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -33,7 +33,7 @@ setup_requires = python_requires = >=3.7 install_requires = dipy>=1.0.0 - groupyr>=0.2.7 + groupyr>=0.3.1 matplotlib numpy pandas>=1.1.0 From be4826e8493584d06ff94f7bd75a4587c5a8c197 Mon Sep 17 00:00:00 2001 From: Ariel Rokem Date: Mon, 27 Mar 2023 11:26:00 -0700 Subject: [PATCH 5/5] Update groupyr dependency again. --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index d7ae6b0d..c3c31965 100644 --- a/setup.cfg +++ b/setup.cfg @@ -33,7 +33,7 @@ setup_requires = python_requires = >=3.7 install_requires = dipy>=1.0.0 - groupyr>=0.3.1 + groupyr>=0.3.2 matplotlib numpy pandas>=1.1.0