Merge remote-tracking branch 'aws/master' into master

Author: metrizable

buildspec.yml

@@ -16,7 +16,7 @@ phases:
 
       - start_time=`date +%s`
       - |
-        execute-command-if-has-matching-changes "env -u AWS_DEFAULT_REGION tox -e py38 -- tests/integ -m \"not local_mode and not cron\" -n 512 --reruns 3 --reruns-delay 5 --durations 50 --boto-config '{\"region_name\": \"us-east-2\"}'" "tests/integ" "tests/scripts" "tests/data" "tests/conftest.py" "tests/__init__.py" "src/*.py" "setup.py" "setup.cfg" "buildspec.yml"
+        execute-command-if-has-matching-changes "env -u AWS_DEFAULT_REGION tox -e py38 -- tests/integ -m \"not local_mode and not cron\" -n 384 --reruns 3 --reruns-delay 15 --durations 50 --boto-config '{\"region_name\": \"us-east-2\"}'" "tests/integ" "tests/scripts" "tests/data" "tests/conftest.py" "tests/__init__.py" "src/*.py" "setup.py" "setup.cfg" "buildspec.yml"
       - ./ci-scripts/displaytime.sh 'py38 tests/integ' $start_time
 
   post_build:

src/sagemaker/tensorflow/defaults.py

@@ -13,4 +13,4 @@
 """Placeholder docstring"""
 from __future__ import absolute_import
 
-LATEST_PY2_VERSION = "2.1.0"
+LATEST_PY2_VERSION = "2.1.1"

src/sagemaker/tensorflow/estimator.py

@@ -35,7 +35,7 @@ class TensorFlow(Framework):
     _framework_name = "tensorflow"
 
     _HIGHEST_LEGACY_MODE_ONLY_VERSION = version.Version("1.10.0")
-    _HIGHEST_PYTHON_2_VERSION = version.Version("2.1.0")
+    _HIGHEST_PYTHON_2_VERSION = version.Version("2.1.1")
 
     def __init__(
         self,

tests/unit/sagemaker/tensorflow/test_estimator_init.py

@@ -39,18 +39,18 @@ def _build_tf(sagemaker_session, **kwargs):
 
 @patch("sagemaker.fw_utils.python_deprecation_warning")
 def test_estimator_py2_deprecation_warning(warning, sagemaker_session):
-    estimator = _build_tf(sagemaker_session, framework_version="2.1.0", py_version="py2")
+    estimator = _build_tf(sagemaker_session, framework_version="2.1.1", py_version="py2")
 
     assert estimator.py_version == "py2"
-    warning.assert_called_with("tensorflow", "2.1.0")
+    warning.assert_called_with("tensorflow", "2.1.1")
 
 
 def test_py2_version_deprecated(sagemaker_session):
     with pytest.raises(AttributeError) as e:
-        _build_tf(sagemaker_session, framework_version="2.1.1", py_version="py2")
+        _build_tf(sagemaker_session, framework_version="2.1.2", py_version="py2")
 
     msg = (
-        "Python 2 containers are only available with 2.1.0 and lower versions. "
+        "Python 2 containers are only available with 2.1.1 and lower versions. "
         "Please use a Python 3 container."
     )
     assert msg in str(e.value)