Merge branch 'master' into remove-shortbread

Author: ahsan-z-khan

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v2.59.0 (2021-09-01)
+
+### Features
+
+ * Add KIX account for SM XGBoost 1.2-2 and 1.3-1
+
+### Bug Fixes and Other Changes
+
+ * revert #2572 and address #2611
+
 ## v2.58.0 (2021-08-31)
 
 ### Features

VERSION

@@ -1 +1 @@
-2.58.1.dev0
+2.59.1.dev0

setup.py

@@ -51,8 +51,8 @@ def read_version():
     "local": [
         "urllib3>=1.21.1,!=1.25,!=1.25.1",
         "docker-compose>=1.25.2",
+        "docker==5.0.0",
         "PyYAML>=5.3, <6",  # PyYAML version has to match docker-compose requirements
-        "psutil",
     ],
     "scipy": ["scipy>=0.19.0"],
 }

src/sagemaker/image_uri_config/xgboost.json

@@ -166,6 +166,7 @@
                 "ap-east-1": "651117190479",
                 "ap-northeast-1": "354813040037",
                 "ap-northeast-2": "366743142698",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "720646828776",
                 "ap-southeast-1": "121021644041",
                 "ap-southeast-2": "783357654285",
@@ -195,6 +196,7 @@
                 "ap-east-1": "651117190479",
                 "ap-northeast-1": "354813040037",
                 "ap-northeast-2": "366743142698",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "720646828776",
                 "ap-southeast-1": "121021644041",
                 "ap-southeast-2": "783357654285",

src/sagemaker/local/image.py

@@ -31,10 +31,8 @@
 import tempfile
 
 from distutils.spawn import find_executable
-from signal import SIGTERM
 from threading import Thread
 
-import psutil
 from six.moves.urllib.parse import urlparse
 
 import sagemaker
@@ -843,8 +841,6 @@ def run(self):
 
     def down(self):
         """Placeholder docstring"""
-        for process in psutil.Process(self.process.pid).children():
-            process.send_signal(SIGTERM)
         self.process.terminate()