Merge branch 'master' into master

Author: benieric

tests/integ/sagemaker/workflow/test_model_create_and_registration.py

@@ -26,7 +26,6 @@
 import pytest
 
 from packaging.version import Version
-from packaging.specifiers import SpecifierSet
 
 from sagemaker.model_card.model_card import ModelCard, ModelOverview, ModelPackageModelCard
 from sagemaker.model_card.schema_constraints import ModelCardStatusEnum
@@ -1422,7 +1421,7 @@ def test_model_registration_with_tensorflow_model_with_pipeline_model(
     pipeline_name,
     region_name,
 ):
-    if Version(tf_full_version) in SpecifierSet("==2.16.*"):
+    if Version(tf_full_version) >= Version("2.16"):
         pytest.skip(
             "This test is failing in TensorFlow 2.16 beacuse of an upstream bug: "
             "https://github.com/tensorflow/io/issues/2039"

tests/integ/sagemaker/workflow/test_model_steps.py

@@ -18,7 +18,6 @@
 import pytest
 
 from packaging.version import Version
-from packaging.specifiers import SpecifierSet
 
 from tests.integ.sagemaker.workflow.helpers import wait_pipeline_execution
 from sagemaker.workflow.fail_step import FailStep
@@ -592,7 +591,7 @@ def test_model_registration_with_drift_check_baselines_and_model_metrics(
 def test_model_registration_with_tensorflow_model_with_pipeline_model(
     pipeline_session, role, tf_full_version, tf_full_py_version, pipeline_name
 ):
-    if Version(tf_full_version) in SpecifierSet("==2.16.*"):
+    if Version(tf_full_version) >= Version("2.16"):
         pytest.skip(
             "This test is failing in TensorFlow 2.16 beacuse of an upstream bug: "
             "https://github.com/tensorflow/io/issues/2039"

tests/integ/sagemaker/workflow/test_training_steps.py

@@ -19,7 +19,6 @@
 import pytest
 
 from packaging.version import Version
-from packaging.specifiers import SpecifierSet
 
 from tests.integ.sagemaker.workflow.helpers import wait_pipeline_execution
 from sagemaker import TrainingInput, get_execution_role, utils, image_uris
@@ -238,7 +237,7 @@ def test_training_step_with_output_path_as_join(
 def test_tensorflow_training_step_with_parameterized_code_input(
     pipeline_session, role, tf_full_version, tf_full_py_version, pipeline_name
 ):
-    if Version(tf_full_version) in SpecifierSet("==2.16.*"):
+    if Version(tf_full_version) >= Version("2.16"):
         pytest.skip(
             "This test is failing in TensorFlow 2.16 beacuse of an upstream bug: "
             "https://github.com/tensorflow/io/issues/2039"

tests/integ/test_transformer.py

@@ -19,7 +19,6 @@
 import pytest
 
 from packaging.version import Version
-from packaging.specifiers import SpecifierSet
 
 from sagemaker import KMeans, s3, get_execution_role
 from sagemaker.mxnet import MXNet
@@ -556,7 +555,7 @@ def test_transform_mxnet_logs(
 def test_transform_tf_kms_network_isolation(
     sagemaker_session, cpu_instance_type, tmpdir, tf_full_version, tf_full_py_version
 ):
-    if Version(tf_full_version) in SpecifierSet("==2.16.*"):
+    if Version(tf_full_version) >= Version("2.16"):
         pytest.skip(
             "This test is failing in TensorFlow 2.16 beacuse of an upstream bug: "
             "https://github.com/tensorflow/io/issues/2039"