From b56252ea9b39b5b1908e7593d3010a51d744b53a Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Wed, 8 Sep 2021 11:53:09 +0200 Subject: [PATCH 1/5] TST fix brittle test in pypy for error message --- sklearn/linear_model/tests/test_sgd.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sklearn/linear_model/tests/test_sgd.py b/sklearn/linear_model/tests/test_sgd.py index 7171c860254ff..86ecf42d878e9 100644 --- a/sklearn/linear_model/tests/test_sgd.py +++ b/sklearn/linear_model/tests/test_sgd.py @@ -254,7 +254,8 @@ def test_sgd_estimator_params_validation(klass, fit_method, params, err_msg): try: sgd_estimator = klass(**params) except TypeError as err: - if "__init__() got an unexpected keyword argument" in str(err): + print(err) + if "unexpected keyword arguments" in str(err): # skip test if the parameter is not supported by the estimator return raise err From 32efd06c4cf1055093b2f9983436cd4f2b7b7749 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Wed, 8 Sep 2021 13:02:03 +0200 Subject: [PATCH 2/5] iter --- .circleci/config.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b730ae0ff595a..614c77b4a87ab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -188,10 +188,8 @@ workflows: requires: - lint - pypy3: - filters: - branches: - only: - - 0.20.X + requires: + - lint - deploy: requires: - doc From 7eba17a4b1bea1b656c7dda58c673381088ed2c6 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Wed, 8 Sep 2021 13:39:38 +0200 Subject: [PATCH 3/5] Update test_sgd.py --- sklearn/linear_model/tests/test_sgd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sklearn/linear_model/tests/test_sgd.py b/sklearn/linear_model/tests/test_sgd.py index 86ecf42d878e9..a1bfa3fdf612f 100644 --- a/sklearn/linear_model/tests/test_sgd.py +++ b/sklearn/linear_model/tests/test_sgd.py @@ -255,7 +255,7 @@ def test_sgd_estimator_params_validation(klass, fit_method, params, err_msg): sgd_estimator = klass(**params) except TypeError as err: print(err) - if "unexpected keyword arguments" in str(err): + if "unexpected keyword argument" in str(err): # skip test if the parameter is not supported by the estimator return raise err From eda144c4a35a196634f7c8b0d1a9c3c77ec9e635 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Wed, 8 Sep 2021 17:03:19 +0200 Subject: [PATCH 4/5] Update test_sgd.py --- sklearn/linear_model/tests/test_sgd.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sklearn/linear_model/tests/test_sgd.py b/sklearn/linear_model/tests/test_sgd.py index a1bfa3fdf612f..9b4c443ac1993 100644 --- a/sklearn/linear_model/tests/test_sgd.py +++ b/sklearn/linear_model/tests/test_sgd.py @@ -254,7 +254,6 @@ def test_sgd_estimator_params_validation(klass, fit_method, params, err_msg): try: sgd_estimator = klass(**params) except TypeError as err: - print(err) if "unexpected keyword argument" in str(err): # skip test if the parameter is not supported by the estimator return From 8476a6b29a496c23be444a9fda90e2434d065c40 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Wed, 8 Sep 2021 17:21:28 +0200 Subject: [PATCH 5/5] remove pypy3 in PRs --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 614c77b4a87ab..c28fefa4e96e2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -187,9 +187,6 @@ workflows: - doc-min-dependencies: requires: - lint - - pypy3: - requires: - - lint - deploy: requires: - doc