Merge branch 'refactor-tensorflow-general' of https://github.com/eslesar-aws/sagemaker-python-sdk into refactor-tensorflow-general

Author: eslesar-aws

doc/overview.rst

@@ -9,7 +9,7 @@ SageMaker Python SDK provides several high-level abstractions for working with A
 - **Predictors**: Provide real-time inference and transformation using Python data-types against a SageMaker endpoint.
 - **Session**: Provides a collection of methods for working with SageMaker resources.
 
-``Estimator`` and ``Model`` implementations for MXNet, TensorFlow, Chainer, PyTorch, scikit-Learn, Amazon SageMaker built-in algorithms, Reinforcement Learning,  are included.
+``Estimator`` and ``Model`` implementations for MXNet, TensorFlow, Chainer, PyTorch, scikit-learn, Amazon SageMaker built-in algorithms, Reinforcement Learning,  are included.
 There's also an ``Estimator`` that runs SageMaker compatible custom Docker containers, enabling you to run your own ML algorithms by using the SageMaker Python SDK.
 
 .. contents::
@@ -30,7 +30,7 @@ After you train a model, you can save it, and then serve the model as an endpoin
 Prepare a Training script
 =========================
 
-Your training script must be a Python 2.7 or 3.5 compatible source file.
+Your training script must be a Python 2.7 or 3.6 compatible source file.
 
 The training script is very similar to a training script you might run outside of SageMaker, but you can access useful properties about the training environment through various environment variables, including the following:
 
@@ -984,4 +984,4 @@ Example code using the TensorFlow predictor:
     from sagemaker.tensorflow import TensorFlowPredictor
 
     predictor = TensorFlowPredictor('myexistingendpoint')
-    result = predictor.predict(['my request body'])
+    result = predictor.predict(['my request body'])

tests/integ/test_git.py

@@ -15,6 +15,7 @@
 import os
 
 import numpy
+import pytest
 import tempfile
 
 from tests.integ import lock as lock
@@ -30,6 +31,7 @@
 LOCK_PATH = os.path.join(tempfile.gettempdir(), "sagemaker_test_git_lock")
 
 
+@pytest.mark.local_mode
 def test_git_support_with_pytorch(sagemaker_local_session):
     script_path = "mnist.py"
     data_path = os.path.join(DATA_DIR, "pytorch_mnist")
@@ -59,6 +61,7 @@ def test_git_support_with_pytorch(sagemaker_local_session):
             predictor.delete_endpoint()
 
 
+@pytest.mark.local_mode
 def test_git_support_with_mxnet(sagemaker_local_session, mxnet_full_version):
     script_path = "mnist.py"
     data_path = os.path.join(DATA_DIR, "mxnet_mnist")