Merge branch 'master' into master

Author: chuyang-deng

README.rst

@@ -164,7 +164,7 @@ Setup a Python environment, and install the dependencies listed in ``doc/require
     # conda
     conda create -n sagemaker python=3.7
     conda activate sagemaker
-    conda install --file doc/requirements.txt
+    conda install sphinx=3.1.1 sphinx_rtd_theme=0.5.0
 
     # pip
     pip install -r doc/requirements.txt

tests/integ/test_neo_mxnet.py

@@ -58,6 +58,9 @@ def mxnet_training_job(
 
 
 @pytest.mark.canary_quick
+@pytest.mark.skip(
+    reason="This test is failing because the image uri and the training script format has changed."
+)
 def test_attach_deploy(
     mxnet_training_job, sagemaker_session, cpu_instance_type, cpu_instance_family
 ):
@@ -86,6 +89,9 @@ def test_attach_deploy(
         predictor.predict(data)
 
 
+@pytest.mark.skip(
+    reason="This test is failing because the image uri and the training script format has changed."
+)
 def test_deploy_model(
     mxnet_training_job,
     sagemaker_session,