Merge branch 'master' into fix-docs

Author: laurenyu

setup.py

@@ -34,7 +34,7 @@ def read(fname):
 
 # Declare minimal set for installation
 required_packages = ['boto3>=1.9.55', 'numpy>=1.9.0', 'protobuf>=3.1', 'scipy>=0.19.0',
-                     'urllib3>=1.21', 'PyYAML>=3.2', 'protobuf3-to-dict>=0.1.5',
+                     'urllib3>=1.21', 'PyYAML>=3.2, <4', 'protobuf3-to-dict>=0.1.5',
                      'docker-compose>=1.23.0']
 
 # enum is introduced in Python 3.4. Installing enum back port

tests/integ/test_inference_pipeline.py

@@ -31,7 +31,6 @@
 
 @pytest.mark.continuous_testing
 @pytest.mark.regional_testing
-@pytest.mark.skip(reason="This should be enabled along with the Boto SDK release for CreateModel API changes")
 def test_inference_pipeline_model_deploy(sagemaker_session):
     # Creates a Pipeline model comprising of SparkML (serialized by MLeap) and XGBoost and deploys to one endpoint
     sparkml_data_path = os.path.join(DATA_DIR, 'sparkml_model')