address comments

Author: Chuyang Deng

src/sagemaker/__init__.py

@@ -15,6 +15,7 @@
 
 import logging
 import importlib_metadata
+import sys
 
 from sagemaker import estimator, parameter, tuner  # noqa: F401
 from sagemaker.amazon.kmeans import KMeans, KMeansModel, KMeansPredictor  # noqa: F401
@@ -63,8 +64,9 @@
 
 __version__ = importlib_metadata.version("sagemaker")
 
-logging.getLogger("sagemaker").warning(
-    "SageMaker Python SDK v2 will no longer support Python 2. "
-    "Please see https://github.com/aws/sagemaker-python-sdk/issues/1459 "
-    "for more information"
-)
+if sys.version[0] == "2":
+    logging.getLogger("sagemaker").warning(
+        "SageMaker Python SDK v2 will no longer support Python 2. "
+        "Please see https://github.com/aws/sagemaker-python-sdk/issues/1459 "
+        "for more information"
+    )

src/sagemaker/estimator.py

@@ -39,6 +39,7 @@
     UploadedCode,
     validate_source_dir,
     _region_supports_debugger,
+    parameter_v2_rename_warning,
 )
 from sagemaker.job import _Job
 from sagemaker.local import LocalSession
@@ -1273,9 +1274,7 @@ def __init__(
                 https://docs.aws.amazon.com/sagemaker/latest/dg/API_AlgorithmSpecification.html#SageMaker-Type-AlgorithmSpecification-EnableSageMakerMetricsTimeSeries
                 (default: ``None``).
         """
-        warnings.warn(
-            "Parameter 'image_name' will be renamed to 'image_uri' in SageMaker Python SDK v2."
-        )
+        logging.warning(parameter_v2_rename_warning("image_name", "image_uri"))
         self.image_name = image_name
         self.hyperparam_dict = hyperparameters.copy() if hyperparameters else {}
         super(Estimator, self).__init__(
@@ -1641,9 +1640,7 @@ def __init__(
         self.code_location = code_location
         self.image_name = image_name
         if image_name is not None:
-            warnings.warn(
-                "Parameter 'image_name' will be renamed to 'image_uri' in SageMaker Python SDK v2."
-            )
+            logging.warning(parameter_v2_rename_warning("image_name", "image_uri"))
 
         self.uploaded_code = None
 

src/sagemaker/fw_utils.py

@@ -662,8 +662,8 @@ def python_deprecation_warning(framework, latest_supported_version):
 def parameter_v2_rename_warning(v1_parameter_name, v2_parameter_name):
     """
     Args:
-        v1_parameter_name:
-        v2_parameter_name:
+        v1_parameter_name: parameter name used in SageMaker Python SDK v1
+        v2_parameter_name: parameter name used in SageMaker Python SDK v2
     """
     return PARAMETER_V2_RENAME_WARNING.format(
         v1_parameter_name=v1_parameter_name, v2_parameter_name=v2_parameter_name

src/sagemaker/model.py

@@ -108,9 +108,7 @@ def __init__(
             model_kms_key (str): KMS key ARN used to encrypt the repacked
                 model archive file if the model is repacked
         """
-        LOGGER.warning(
-            "Parameter 'image' will be renamed to 'image_uri' in SageMaker Python SDK v2."
-        )
+        LOGGER.warning(fw_utils.parameter_v2_rename_warning("image", "image_uri"))
 
         self.model_data = model_data
         self.image = image

src/sagemaker/session.py

@@ -183,6 +183,7 @@ def upload_data(self, path, bucket=None, key_prefix="data", extra_args=None):
         # Generate a tuple for each file that we want to upload of the form (local_path, s3_key).
         LOGGER.warning(
             "'upload_data' method will be deprecated in favor of 'S3Uploader' class "
+            "(https://sagemaker.readthedocs.io/en/stable/s3.html#sagemaker.s3.S3Uploader) "
             "in SageMaker Python SDK v2."
         )
 
@@ -237,6 +238,7 @@ def upload_string_as_file_body(self, body, bucket, key, kms_key=None):
         """
         LOGGER.warning(
             "'upload_string_as_file_body' method will be deprecated in favor of 'S3Uploader' class "
+            "(https://sagemaker.readthedocs.io/en/stable/s3.html#sagemaker.s3.S3Uploader) "
             "in SageMaker Python SDK v2."
         )
 
@@ -3333,10 +3335,6 @@ def get_execution_role(sagemaker_session=None):
     Returns:
         (str): The role ARN
     """
-    LOGGER.warning(
-        "'get_execution_role' will be renamed to 'notebook_execution_role' "
-        "in SageMaker Python SDK v2."
-    )
 
     if not sagemaker_session:
         sagemaker_session = Session()

tests/unit/test_mxnet.py

@@ -846,7 +846,7 @@ def test_mx_enable_sm_metrics_if_fw_ver_is_at_least_1_6(sagemaker_session):
         assert mx.enable_sagemaker_metrics
 
 
-def test_custom_image_estimator_deploy(sagemaker_session, caplog):
+def test_custom_image_estimator_deploy(sagemaker_session):
     custom_image = "mycustomimage:latest"
     mx = MXNet(
         entry_point=SCRIPT_PATH,
@@ -858,6 +858,3 @@ def test_custom_image_estimator_deploy(sagemaker_session, caplog):
     mx.fit(inputs="s3://mybucket/train", job_name="new_name")
     model = mx.create_model(image=custom_image)
     assert model.image == custom_image
-
-    warning_message = "Parameter 'image' will be renamed to 'image_uri' in SageMaker Python SDK v2."
-    assert warning_message in caplog.text