Merge branch 'master' into test-buildspec

Author: laurenyu

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## v1.20.2 (2019-05-13)
+
+### Bug fixes and other changes
+
+ * pin pytest version to 4.4.1 to avoid pluggy version conflict
+
+## v1.20.1 (2019-05-09)
+
+### Bug fixes and other changes
+
+ * update TrainingInputMode with s3_input InputMode
+
 ## v1.20.0 (2019-05-08)
 
 ### Features

VERSION

@@ -1 +1 @@
-1.20.1.dev0
+1.20.3.dev0

doc/using_mxnet.rst

@@ -688,8 +688,7 @@ The default implementation expects ``prediction`` to be an ``NDArray`` and can s
 Using ``transform_fn``
 ''''''''''''''''''''''
 
-If you would rather not structure your code around the three methods described above, you can instead define your own ``transform_fn`` to handle inference requests.
-This will override any implementation of ``input_fn``, ``predict_fn``, or ``output_fn``.
+If you would rather not structure your code around the three methods described above, you can instead define your own ``transform_fn`` to handle inference requests. An error will be thrown if a ``transform_fn`` is present in conjunction with any ``input_fn``, ``predict_fn``, and/or ``output_fn``.
 ``transform_fn`` has the following signature:
 
 .. code:: python

setup.py

@@ -60,7 +60,7 @@ def read_version():
       install_requires=required_packages,
 
       extras_require={
-          'test': ['tox', 'flake8', 'pytest', 'pytest-cov', 'pytest-rerunfailures',
+          'test': ['tox', 'flake8', 'pytest==4.4.1', 'pytest-cov', 'pytest-rerunfailures',
                    'pytest-xdist', 'mock', 'tensorflow>=1.3.0', 'contextlib2',
                    'awslogs', 'pandas']},
 

src/sagemaker/tensorflow/estimator.py

@@ -283,6 +283,9 @@ def _validate_requirements_file(self, requirements_file):
         if not self.source_dir:
             raise ValueError('Must specify source_dir along with a requirements file.')
 
+        if self.source_dir.lower().startswith('s3://'):
+            return
+
         if os.path.isabs(requirements_file):
             raise ValueError('Requirements file {} is not a path relative to source_dir.'.format(
                 requirements_file))