Merge branch 'master' into baselinefix

Author: spoorn

src/sagemaker/model.py

@@ -574,6 +574,7 @@ def _upload_code(self, key_prefix: str, repack: bool = False) -> None:
                 script=self.entry_point,
                 directory=self.source_dir,
                 dependencies=self.dependencies,
+                kms_key=self.model_kms_key,
                 settings=self.sagemaker_session.settings,
             )
 

tests/integ/test_inference_recommender.py

@@ -301,7 +301,6 @@ def test_default_right_size_and_deploy_registered_model_sklearn(
             predictor.delete_endpoint()
 
 
-@pytest.mark.skip(reason="This test is currently failing. Skipping until fixed")
 @pytest.mark.slow_test
 def test_default_right_size_and_deploy_unregistered_model_sklearn(
     default_right_sized_unregistered_model, sagemaker_session
@@ -346,7 +345,6 @@ def test_default_right_size_and_deploy_unregistered_base_model(
             predictor.delete_endpoint()
 
 
-@pytest.mark.skip(reason="This test is currently failing. Skipping until fixed")
 @pytest.mark.slow_test
 def test_advanced_right_size_and_deploy_unregistered_model_sklearn(
     advanced_right_sized_unregistered_model, sagemaker_session