Merge branch 'master' into merge-master

Author: laurenyu

.pylintrc

@@ -76,21 +76,22 @@ confidence=
 # --disable=W"
 disable=
     C0330, # Black disagrees with and explicitly violates this: https://github.com/python/black/issues/48
-    too-many-locals,
+    abstract-method, # TODO: Fix abstract methods
     arguments-differ,
-    too-many-lines,
+    cyclic-import, # TODO: Resolve cyclic imports
     fixme,
-    too-many-arguments,
     invalid-name,
-    too-many-instance-attributes,
-    len-as-condition, # TODO: Enable this check once pylint 2.4.0 is released and consumed due to the fix in https://github.com/PyCQA/pylint/issues/2684
     import-error, # Since we run Pylint before any of our builds in tox, this will always fail
-    protected-access, # TODO: Fix access
-    abstract-method, # TODO: Fix abstract methods
-    useless-object-inheritance, # TODO: Enable this check and fix code once Python 2 is no longer supported.
-    cyclic-import, # TODO: Resolve cyclic imports
+    import-outside-toplevel,
     no-self-use, # TODO: Convert methods to functions where appropriate
+    protected-access, # TODO: Fix access
+    signature-differs,  # TODO: fix kwargs
+    too-many-arguments,
     too-many-branches, # TODO: Simplify or ignore as appropriate
+    too-many-instance-attributes,
+    too-many-lines,
+    too-many-locals,
+    useless-object-inheritance, # TODO: Enable this check and fix code once Python 2 is no longer supported.
 
 [REPORTS]
 # Set the output format. Available formats are text, parseable, colorized, msvs

CHANGELOG.md

@@ -25,6 +25,51 @@
  * remove scipy from dependencies
  * remove TF from optional dependencies
 
+## v1.64.0 (2020-06-15)
+
+### Features
+
+ * add support for SKLearn 0.23
+
+## v1.63.0 (2020-06-12)
+
+### Features
+
+ * Allow selecting inference response content for automl generated models
+ * Support for multi variant endpoint invocation with target variant param
+
+### Documentation Changes
+
+ * improve docstring and remove unavailable links
+
+## v1.62.0 (2020-06-11)
+
+### Features
+
+ * Support for multi variant endpoint invocation with target variant param
+
+### Bug Fixes and Other Changes
+
+ * Revert "feature: Support for multi variant endpoint invocation with target variant param (#1571)"
+ * make instance_type optional for prepare_container_def
+ * docs: workflows navigation
+
+### Documentation Changes
+
+ * fix typo in MXNet documentation
+
+## v1.61.0 (2020-06-09)
+
+### Features
+
+ * Use boto3 DEFAULT_SESSION when no boto3 session specified.
+
+### Bug Fixes and Other Changes
+
+ * remove v2 Session warnings
+ * upgrade smdebug-rulesconfig to 0.1.4
+ * explicitly handle arguments in create_model for sklearn and xgboost
+
 ## v1.60.2 (2020-05-29)
 
 ### Bug Fixes and Other Changes

VERSION

@@ -1 +1 @@
-1.60.3.dev0
+1.64.1.dev0

doc/index.rst

@@ -54,15 +54,14 @@ Amazon SageMaker provides implementations of some common machine learning algori
 
 
 *************
-Orchestration
+Workflows
 *************
-Orchestrate your SageMaker training and inference jobs with Kubernetes and Airflow.
+Orchestrate your SageMaker training and inference workflows with Airflow and Kubernetes.
 
 .. toctree::
-    :maxdepth: 1
+    :maxdepth: 2
 
-    kubernetes/index
-    airflow/index
+    workflows/index
 
 
 *************************

doc/airflow/index.rst renamed to doc/workflows/airflow/index.rst

@@ -0,0 +1,11 @@
+##########
+Workflows
+##########
+
+The SageMaker Python SDK supports managed training and inference for a variety of machine learning frameworks:
+
+.. toctree::
+    :maxdepth: 2
+
+    airflow/index
+    kubernetes/index

doc/airflow/sagemaker.workflow.airflow.rst renamed to doc/workflows/airflow/sagemaker.workflow.airflow.rst

@@ -34,7 +34,7 @@ def read_version():
 
 # Declare minimal set for installation
 required_packages = [
-    "boto3>=1.13.6",
+    "boto3>=1.13.24",
     "google-pasta",
     "numpy>=1.9.0",
     "protobuf>=3.1",
@@ -60,16 +60,16 @@ def read_version():
 extras["test"] = (
     [
         extras["all"],
-        "tox==3.13.1",
+        "tox==3.15.1",
         "flake8",
-        "pytest==4.4.1",
+        "pytest==4.6.10",
         "pytest-cov",
         "pytest-rerunfailures",
         "pytest-xdist",
         "mock",
         "contextlib2",
         "awslogs",
-        "black==19.3b0 ; python_version >= '3.6'",
+        "black==19.10b0 ; python_version >= '3.6'",
         "stopit==1.1.2",
         "apache-airflow==1.10.5",
         "fabric>=2.0",

doc/airflow/using_workflow.rst renamed to doc/workflows/airflow/using_workflow.rst

@@ -270,11 +270,11 @@ def read_recordio(f):
     """
     while True:
         try:
-            read_kmagic, = struct.unpack("I", f.read(4))
+            (read_kmagic,) = struct.unpack("I", f.read(4))
         except struct.error:
             return
         assert read_kmagic == _kmagic
-        len_record, = struct.unpack("I", f.read(4))
+        (len_record,) = struct.unpack("I", f.read(4))
         pad = (((len_record + 3) >> 2) << 2) - len_record
         yield f.read(len_record)
         if pad: