Merge branch 'zwei' into serde-compatability

Author: bveeramani

doc/v2.rst

@@ -94,6 +94,28 @@ Please instantiate the objects instead.
 The ``update_endpoint`` argument in ``deploy()`` methods for estimators and models has been deprecated.
 Please use :func:`sagemaker.predictor.Predictor.update_endpoint` instead.
 
+``sagemaker.content_types``
+---------------------------
+
+The ``sagemaker.content_types`` module is removed in v2.0 and later of the
+SageMaker Python SDK.
+
+Instead of importing constants from ``sagemaker.content_types``, explicitly
+write MIME types as a string,
+
++-------------------------------+--------------------------------+
+| v1.x                          | v2.0 and later                 |
++===============================+================================+
+| ``CONTENT_TYPE_JSON``         | ``"application/json"``         |
++-------------------------------+--------------------------------+
+| ``CONTENT_TYPE_CSV``          | ``"text/csv"``                 |
++-------------------------------+--------------------------------+
+| ``CONTENT_TYPE_OCTET_STREAM`` | ``"application/octet-stream"`` |
++-------------------------------+--------------------------------+
+| ``CONTENT_TYPE_NPY``          | ``"application/x-npy"``        |
++-------------------------------+--------------------------------+
+
+
 Require ``framework_version`` and ``py_version`` for Frameworks
 ===============================================================
 

examples/cli/host/data/model.json

@@ -103,7 +103,6 @@ def read_version():
     extras_require=extras,
     entry_points={
         "console_scripts": [
-            "sagemaker=sagemaker.cli.main:main",
             "sagemaker-upgrade-v2=sagemaker.cli.compatibility.v2.sagemaker_upgrade_v2:main",
         ]
     },