black updates, replace mock_s3 with mock_aws

calcloud/batch.py

@@ -2,6 +2,7 @@
 particularly pagination for the list and describe jobs functions which let
 them act on job counts > 100 jobs.
 """
+
 import argparse
 import json
 import datetime

calcloud/common.py

@@ -1,4 +1,5 @@
 """ a module to hold some common configuration items that various scripts may need """
+
 from botocore.config import Config
 
 # we need some mitigation of potential API rate restrictions for the (especially) Batch API

calcloud/exit_codes.py

@@ -9,7 +9,6 @@
 generic values of 0 or 1 to prevent conflicts with these codes.
 """
 
-
 _MEMORY_ERROR_NAMES = ["SUBPROCESS_MEMORY_ERROR", "CALDP_MEMORY_ERROR", "CONTAINER_MEMORY_ERROR", "OS_MEMORY_ERROR"]
 
 

calcloud/io.py

@@ -2,6 +2,7 @@
 It hides the structure of the messaging system and provides a
 simple API for putting, getting, listing, and deleting messages.
 """
+
 import sys
 import os
 import doctest

calcloud/lambda_submit.py

@@ -12,6 +12,7 @@
 handlers for more information on how jobs are initiated and
 retried.
 """
+
 import time
 import os
 

calcloud/log.py

@@ -56,6 +56,7 @@
 
 >>> _ = log.set_verbose(old_verbose)
 """
+
 import sys
 import os
 import logging

calcloud/model_ingest.py

@@ -2,6 +2,7 @@
 
 See ModelIngest/lambda_scrape.py for more information on how model data is ingested to DDB.
 """
+
 import boto3
 import sys
 import numpy as np

calcloud/plan.py

@@ -8,6 +8,7 @@
 of job definitions with increasing memory requirements until the job later
 succeeds with sufficient memory or exhausts all retries.
 """
+
 import sys
 import os
 from collections import namedtuple

calcloud/s3.py

@@ -7,6 +7,7 @@
 
     bucket_name, object_path = s3_split_path(s3_path)
 """
+
 import os
 import os.path
 

calcloud/timing.py

@@ -1,6 +1,7 @@
 """This module provides functions and classes used to track and compute
 rate metrics.
 """
+
 from collections import Counter
 import datetime
 import os

lambda/JobPredict/predict_handler.py

@@ -4,6 +4,7 @@
 # 3 - load models and generate predictions
 # 4 - return preds as json to parent lambda function
 """
+
 import boto3
 import numpy as np
 from sklearn.preprocessing import PowerTransformer

lambda/broadcast/broadcast_handler.py

@@ -11,6 +11,7 @@
 For small payloads,  the broadcast message iterates over the payload
 and directly putting each message.
 """
+
 from calcloud import io
 from calcloud import s3
 

tests/conftest.py

@@ -7,7 +7,7 @@
 
 import pytest
 import boto3
-from moto import mock_s3, mock_batch, mock_iam, mock_ec2, mock_lambda, mock_dynamodb
+from moto import mock_aws, mock_batch, mock_iam, mock_ec2, mock_lambda, mock_dynamodb
 import yaml
 
 # for logging to double-check we're getting fake credentials and not real ones
@@ -67,15 +67,15 @@ def aws_credentials():
 
 @pytest.fixture(scope="function")
 def s3_client(aws_credentials):
-    with mock_s3():
+    with mock_aws():
         s3_client = boto3.client("s3", region_name="us-east-1")
         s3_client.create_bucket(Bucket=os.environ["BUCKET"])
         yield s3_client
 
 
 @pytest.fixture(scope="function")
 def s3_resource(aws_credentials):
-    with mock_s3():
+    with mock_aws():
         yield boto3.resource("s3", region_name="us-east-1")
 
 

tests/test_ami_rotation.py

@@ -1,4 +1,5 @@
 """ test that the ami rotation lambda will launch an ec2 instance """
+
 import os