Merge branch 'dev' into tioga_failstep

Author: mufaddal-rohawala

doc/conf.py

@@ -16,7 +16,7 @@
 import pkg_resources
 from datetime import datetime
 
-project = u"sagemaker"
+project = "sagemaker"
 version = pkg_resources.require(project)[0].version
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
@@ -38,7 +38,7 @@
 source_suffix = ".rst"  # The suffix of source filenames.
 master_doc = "index"  # The master toctree document.
 
-copyright = u"%s, Amazon" % datetime.now().year
+copyright = "%s, Amazon" % datetime.now().year
 
 # The full version, including alpha/beta/rc tags.
 release = version

src/sagemaker/analytics.py

@@ -261,7 +261,11 @@ def training_job_summaries(self, force_refresh=False):
             )
             new_output = raw_result["TrainingJobSummaries"]
             output.extend(new_output)
-            logger.debug("Got %d more TrainingJobs. Total so far: %d", len(new_output), len(output))
+            logger.debug(
+                "Got %d more TrainingJobs. Total so far: %d",
+                len(new_output),
+                len(output),
+            )
             if ("NextToken" in raw_result) and (len(new_output) > 0):
                 next_args["NextToken"] = raw_result["NextToken"]
             else:
@@ -344,7 +348,7 @@ def _determine_timeinterval(self):
             a dict with the `start_time` and `end_time`.
         """
         description = self._sage_client.describe_training_job(TrainingJobName=self.name)
-        start_time = self._start_time or description[u"TrainingStartTime"]  # datetime object
+        start_time = self._start_time or description["TrainingStartTime"]  # datetime object
         # Incrementing end time by 1 min since CloudWatch drops seconds before finding the logs.
         # This results in logs being searched in the time range in which the correct log line was
         # not present.
@@ -353,7 +357,7 @@ def _determine_timeinterval(self):
         #       CW will consider end time as 2018-10-22 08:25 and will not be able to search the
         #           correct log.
         end_time = self._end_time or description.get(
-            u"TrainingEndTime", datetime.datetime.utcnow()
+            "TrainingEndTime", datetime.datetime.utcnow()
         ) + datetime.timedelta(minutes=1)
 
         return {"start_time": start_time, "end_time": end_time}

src/sagemaker/utils.py

@@ -79,7 +79,7 @@ def name_from_base(base, max_length=63, short=False):
 
 def unique_name_from_base(base, max_length=63):
     """Placeholder Docstring"""
-    unique = "%04x" % random.randrange(16 ** 4)  # 4-digit hex
+    unique = "%04x" % random.randrange(16**4)  # 4-digit hex
     ts = str(int(time.time()))
     available_length = max_length - 2 - len(ts) - len(unique)
     trimmed = base[:available_length]
@@ -413,7 +413,12 @@ def repack_model(
         model_dir = _extract_model(model_uri, sagemaker_session, tmp)
 
         _create_or_update_code_dir(
-            model_dir, inference_script, source_directory, dependencies, sagemaker_session, tmp
+            model_dir,
+            inference_script,
+            source_directory,
+            dependencies,
+            sagemaker_session,
+            tmp,
         )
 
         tmp_model_path = os.path.join(tmp, "temp-model.tar.gz")
@@ -544,7 +549,11 @@ def sts_regional_endpoint(region):
     return "https://{}".format(endpoint_data["hostname"])
 
 
-def retries(max_retry_count, exception_message_prefix, seconds_to_sleep=DEFAULT_SLEEP_TIME_SECONDS):
+def retries(
+    max_retry_count,
+    exception_message_prefix,
+    seconds_to_sleep=DEFAULT_SLEEP_TIME_SECONDS,
+):
     """Retries until max retry count is reached.
 
     Args:

tests/data/multimodel/container/Dockerfile

@@ -15,7 +15,7 @@ RUN apt-get update && \
     curl \
     vim \
     && rm -rf /var/lib/apt/lists/* \
-    && curl -O https://bootstrap.pypa.io/get-pip.py \
+    && curl -O https://bootstrap.pypa.io/pip/3.6/get-pip.py \
     && python3 get-pip.py
 
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1

tests/integ/sagemaker/lineage/helpers.py

@@ -42,7 +42,7 @@ def retry(callable, num_attempts=8):
             if i == num_attempts - 1:
                 raise ex
             print("Retrying", ex)
-            time.sleep(2 ** i)
+            time.sleep(2**i)
     assert False, "logic error in retry"