Étienne Mollier pushed to branch master at Debian Med / q2-sample-classifier
Commits: 5a05ab3b by Étienne Mollier at 2023-08-30T22:38:17+02:00 convert-estimator.patch: new: fix autopkgtest failure. - - - - - 79da3507 by Étienne Mollier at 2023-08-30T22:38:38+02:00 sklearn-1.2.1.patch: forwarded upstream. - - - - - bc439e4d by Étienne Mollier at 2023-08-30T22:43:17+02:00 ready to upload to unstable. - - - - - 4 changed files: - debian/changelog - + debian/patches/convert-estimator.patch - debian/patches/series - debian/patches/sklearn-1.2.1.patch Changes: ===================================== debian/changelog ===================================== @@ -1,14 +1,13 @@ -q2-sample-classifier (2023.7.0-1) UNRELEASED; urgency=medium - - TODO: autopkgtest fails with two instances of: - AssertionError: <class 'str'> != <class 'sklearn.tree._classes.ExtraTreeClassifier'> +q2-sample-classifier (2023.7.0-1) unstable; urgency=medium * New upstream version 2023.7.0 * reduce-precision-in-tests.patch: refresh. * fix-autopkgtest.patch: refresh. * sklearn-1.2.1.patch: refresh. + * convert-estimator.patch: new: fix autopkgtest failure. + * sklearn-1.2.1.patch: forwarded upstream. - -- Étienne Mollier <[email protected]> Sun, 20 Aug 2023 14:32:50 +0200 + -- Étienne Mollier <[email protected]> Wed, 30 Aug 2023 22:38:55 +0200 q2-sample-classifier (2022.11.1-3) unstable; urgency=medium ===================================== debian/patches/convert-estimator.patch ===================================== @@ -0,0 +1,28 @@ +Description: fix use of obsolete base_estimator AdaBoost attribute + The AdaBoostRegressor base_estimator attribute has been renamed "estimator" + in scikit 1.2 onwards. +Author: Étienne Mollier <[email protected]> +Bug: https://github.com/qiime2/q2-sample-classifier/issues/227 +Last-Update: 2023-08-30 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- q2-sample-classifier.orig/q2_sample_classifier/tests/test_estimators.py ++++ q2-sample-classifier/q2_sample_classifier/tests/test_estimators.py +@@ -398,7 +398,7 @@ + parameter_tuning=True, classification=True, + missing_samples='ignore', base_estimator="DecisionTree") + self.assertEqual(type(abe.named_steps.est), AdaBoostClassifier) +- self.assertEqual(type(abe.named_steps.est.base_estimator), ++ self.assertEqual(type(abe.named_steps.est.estimator), + DecisionTreeClassifier) + + def test_train_adaboost_extra_trees(self): +@@ -408,7 +408,7 @@ + parameter_tuning=True, classification=True, + missing_samples='ignore', base_estimator="ExtraTrees") + self.assertEqual(type(abe.named_steps.est), AdaBoostClassifier) +- self.assertEqual(type(abe.named_steps.est.base_estimator), ++ self.assertEqual(type(abe.named_steps.est.estimator), + ExtraTreeClassifier) + + # test some invalid inputs/edge cases ===================================== debian/patches/series ===================================== @@ -2,3 +2,4 @@ py2to3test.patch reduce-precision-in-tests.patch fix-autopkgtest.patch sklearn-1.2.1.patch +convert-estimator.patch ===================================== debian/patches/sklearn-1.2.1.patch ===================================== @@ -3,7 +3,7 @@ Description: fix get_feature_names deprecation with sklearn 1.2.1 AttributeError: 'DictVectorizer' object has no attribute 'get_feature_names' This function is replaced by get_feature_names_out. Author: Étienne Mollier <[email protected]> -Forwarded: no +Forwarded: https://github.com/qiime2/q2-sample-classifier/issues/227 Last-Update: 2023-02-02 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ View it on GitLab: https://salsa.debian.org/med-team/q2-sample-classifier/-/compare/3c081f0459c9a044c5d73475e247d8eaddb4f0a7...bc439e4d49dce55aad711eb8f6d25ae72b1c39c9 -- View it on GitLab: https://salsa.debian.org/med-team/q2-sample-classifier/-/compare/3c081f0459c9a044c5d73475e247d8eaddb4f0a7...bc439e4d49dce55aad711eb8f6d25ae72b1c39c9 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
