Merge branch 'main' into drop-none-attrs

mergify[bot] · web-flow · commit 4039d066d026 · 2024-02-20T21:54:17.000Z
diff --git a/tests/mlmodel_sklearn/test_cluster_models.py b/tests/mlmodel_sklearn/test_cluster_models.py
@@ -19,10 +19,10 @@
 )
 
 from newrelic.api.background_task import background_task
-from newrelic.common.package_version_utils import get_package_version
+from newrelic.common.package_version_utils import get_package_version_tuple
 from newrelic.packages import six
 
-SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))
+SKLEARN_VERSION = get_package_version_tuple("sklearn")
 
 
 @pytest.mark.parametrize(
diff --git a/tests/mlmodel_sklearn/test_dummy_models.py b/tests/mlmodel_sklearn/test_dummy_models.py
@@ -19,10 +19,10 @@
 )
 
 from newrelic.api.background_task import background_task
-from newrelic.common.package_version_utils import get_package_version
+from newrelic.common.package_version_utils import get_package_version_tuple
 from newrelic.packages import six
 
-SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))
+SKLEARN_VERSION = get_package_version_tuple("sklearn")
 
 
 @pytest.mark.parametrize(
diff --git a/tests/mlmodel_sklearn/test_ensemble_models.py b/tests/mlmodel_sklearn/test_ensemble_models.py
@@ -19,10 +19,10 @@
 )
 
 from newrelic.api.background_task import background_task
-from newrelic.common.package_version_utils import get_package_version
+from newrelic.common.package_version_utils import get_package_version_tuple
 from newrelic.packages import six
 
-SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))
+SKLEARN_VERSION = get_package_version_tuple("sklearn")
 
 
 @pytest.mark.parametrize(
@@ -197,7 +197,6 @@ def _test():
     _test()
 
 
-
 @pytest.mark.skipif(SKLEARN_VERSION < (1, 1, 0), reason="Requires sklearn >= 1.1")
 @pytest.mark.parametrize(
     "ensemble_model_name",
diff --git a/tests/mlmodel_sklearn/test_feature_selection_models.py b/tests/mlmodel_sklearn/test_feature_selection_models.py
@@ -19,10 +19,10 @@
 )
 
 from newrelic.api.background_task import background_task
-from newrelic.common.package_version_utils import get_package_version
+from newrelic.common.package_version_utils import get_package_version_tuple
 from newrelic.packages import six
 
-SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))
+SKLEARN_VERSION = get_package_version_tuple("sklearn")
 
 
 @pytest.mark.parametrize(
diff --git a/tests/mlmodel_sklearn/test_linear_models.py b/tests/mlmodel_sklearn/test_linear_models.py
@@ -18,11 +18,11 @@
 )
 
 from newrelic.api.background_task import background_task
-from newrelic.common.package_version_utils import get_package_version
+from newrelic.common.package_version_utils import get_package_version_tuple
 from newrelic.packages import six
 
-SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))
-SCIPY_VERSION = tuple(map(int, get_package_version("scipy").split(".")))
+SKLEARN_VERSION = get_package_version_tuple("sklearn")
+SCIPY_VERSION = get_package_version_tuple("scipy")
 
 
 @pytest.mark.parametrize(
diff --git a/tests/mlmodel_sklearn/test_multioutput_models.py b/tests/mlmodel_sklearn/test_multioutput_models.py
@@ -20,10 +20,10 @@
 )
 
 from newrelic.api.background_task import background_task
-from newrelic.common.package_version_utils import get_package_version
+from newrelic.common.package_version_utils import get_package_version_tuple
 from newrelic.packages import six
 
-SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))
+SKLEARN_VERSION = get_package_version_tuple("sklearn")
 
 
 # Python 2 will not allow instantiation of abstract class
diff --git a/tests/mlmodel_sklearn/test_naive_bayes_models.py b/tests/mlmodel_sklearn/test_naive_bayes_models.py
@@ -19,10 +19,10 @@
 )
 
 from newrelic.api.background_task import background_task
-from newrelic.common.package_version_utils import get_package_version
+from newrelic.common.package_version_utils import get_package_version_tuple
 from newrelic.packages import six
 
-SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))
+SKLEARN_VERSION = get_package_version_tuple("sklearn")
 
 
 @pytest.mark.skipif(SKLEARN_VERSION < (1, 0, 0), reason="Requires sklearn >= 1.0")
diff --git a/tests/mlmodel_sklearn/test_neighbors_models.py b/tests/mlmodel_sklearn/test_neighbors_models.py
@@ -19,10 +19,10 @@
 )
 
 from newrelic.api.background_task import background_task
-from newrelic.common.package_version_utils import get_package_version
+from newrelic.common.package_version_utils import get_package_version_tuple
 from newrelic.packages import six
 
-SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))
+SKLEARN_VERSION = get_package_version_tuple("sklearn")
 
 
 @pytest.mark.parametrize(
diff --git a/tests/mlmodel_sklearn/test_neural_network_models.py b/tests/mlmodel_sklearn/test_neural_network_models.py
@@ -18,10 +18,10 @@
 )
 
 from newrelic.api.background_task import background_task
-from newrelic.common.package_version_utils import get_package_version
+from newrelic.common.package_version_utils import get_package_version_tuple
 from newrelic.packages import six
 
-SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))
+SKLEARN_VERSION = get_package_version_tuple("sklearn")
 
 
 @pytest.mark.parametrize(
diff --git a/tests/mlmodel_sklearn/test_pipeline_models.py b/tests/mlmodel_sklearn/test_pipeline_models.py
@@ -21,10 +21,10 @@
 )
 
 from newrelic.api.background_task import background_task
-from newrelic.common.package_version_utils import get_package_version
+from newrelic.common.package_version_utils import get_package_version_tuple
 from newrelic.packages import six
 
-SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))
+SKLEARN_VERSION = get_package_version_tuple("sklearn")
 
 
 @pytest.mark.parametrize(
diff --git a/tests/mlmodel_sklearn/test_semi_supervised_models.py b/tests/mlmodel_sklearn/test_semi_supervised_models.py
@@ -19,10 +19,10 @@
 )
 
 from newrelic.api.background_task import background_task
-from newrelic.common.package_version_utils import get_package_version
+from newrelic.common.package_version_utils import get_package_version_tuple
 from newrelic.packages import six
 
-SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))
+SKLEARN_VERSION = get_package_version_tuple("sklearn")
 
 
 @pytest.mark.parametrize(
diff --git a/tests/mlmodel_sklearn/test_svm_models.py b/tests/mlmodel_sklearn/test_svm_models.py
@@ -18,10 +18,10 @@
 )
 
 from newrelic.api.background_task import background_task
-from newrelic.common.package_version_utils import get_package_version
+from newrelic.common.package_version_utils import get_package_version_tuple
 from newrelic.packages import six
 
-SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))
+SKLEARN_VERSION = get_package_version_tuple("sklearn")
 
 
 @pytest.mark.parametrize(

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`from newrelic.api.background_task import background_task`
`22`		`-from newrelic.common.package_version_utils import get_package_version`
	`22`	`+from newrelic.common.package_version_utils import get_package_version_tuple`
`23`	`23`	`from newrelic.packages import six`
`24`	`24`
`25`		`-SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))`
	`25`	`+SKLEARN_VERSION = get_package_version_tuple("sklearn")`
`26`	`26`
`27`	`27`
`28`	`28`	`@pytest.mark.parametrize(`
Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,10 @@`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`from newrelic.api.background_task import background_task`
`23`		`-from newrelic.common.package_version_utils import get_package_version`
	`23`	`+from newrelic.common.package_version_utils import get_package_version_tuple`
`24`	`24`	`from newrelic.packages import six`
`25`	`25`
`26`		`-SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))`
	`26`	`+SKLEARN_VERSION = get_package_version_tuple("sklearn")`
`27`	`27`
`28`	`28`
`29`	`29`	`# Python 2 will not allow instantiation of abstract class`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,10 @@`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`from newrelic.api.background_task import background_task`
`21`		`-from newrelic.common.package_version_utils import get_package_version`
	`21`	`+from newrelic.common.package_version_utils import get_package_version_tuple`
`22`	`22`	`from newrelic.packages import six`
`23`	`23`
`24`		`-SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))`
	`24`	`+SKLEARN_VERSION = get_package_version_tuple("sklearn")`
`25`	`25`
`26`	`26`
`27`	`27`	`@pytest.mark.parametrize(`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`from newrelic.api.background_task import background_task`
`24`		`-from newrelic.common.package_version_utils import get_package_version`
	`24`	`+from newrelic.common.package_version_utils import get_package_version_tuple`
`25`	`25`	`from newrelic.packages import six`
`26`	`26`
`27`		`-SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))`
	`27`	`+SKLEARN_VERSION = get_package_version_tuple("sklearn")`
`28`	`28`
`29`	`29`
`30`	`30`	`@pytest.mark.parametrize(`