Merge branch 'release-1.12.164'

* release-1.12.164: Bumping version to 1.12.164 Update to latest endpoints Update to latest models Remove importexport error smoke test
elbrujohalcon · Jun 7, 2019 · 302481a · 302481a
2 parents 29f598c + 7a0ad2e
commit 302481a
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 45 deletions.
diff --git a/.changes/1.12.164.json b/.changes/1.12.164.json
@@ -0,0 +1,7 @@
+[
+  {
+    "category": "``ec2``", 
+    "description": "Update ec2 client to latest version", 
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 CHANGELOG
 =========
 
+1.12.164
+========
+
+* api-change:``ec2``: Update ec2 client to latest version
+
+
 1.12.163
 ========
 

diff --git a/botocore/__init__.py b/botocore/__init__.py
@@ -16,7 +16,7 @@
 import re
 import logging
 
-__version__ = '1.12.163'
+__version__ = '1.12.164'
 
 
 class NullHandler(logging.Handler):

diff --git a/botocore/data/ec2/2016-11-15/service-2.json b/botocore/data/ec2/2016-11-15/service-2.json
diff --git a/botocore/data/endpoints.json b/botocore/data/endpoints.json
@@ -2964,7 +2964,7 @@
       },
       "support" : {
         "endpoints" : {
-          "us-east-1" : { }
+          "aws-global" : { }
         }
       },
       "swf" : {
@@ -3400,6 +3400,18 @@
           "cn-northwest-1" : { }
         }
       },
+      "kms" : {
+        "endpoints" : {
+          "ProdFips" : {
+            "credentialScope" : {
+              "region" : "cn-northwest-1"
+            },
+            "hostname" : "kms-fips.cn-northwest-1.amazonaws.com.cn"
+          },
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
       "lambda" : {
         "endpoints" : {
           "cn-north-1" : { },

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -54,7 +54,7 @@
 # The short X.Y version.
 version = '1.12.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.12.163'
+release = '1.12.164'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/tests/integration/test_smoke.py b/tests/integration/test_smoke.py
@@ -165,11 +165,6 @@
     'gamelift': {'DescribeBuild': {'BuildId': 'fake-build-id'}},
     'glacier': {'ListVaults': {'accountId': 'fake'}},
     'iam': {'GetUser': {'UserName': 'fake'}},
-    'importexport': {'CreateJob': {
-        'JobType': 'Import',
-        'ValidateOnly': False,
-        'Manifest': 'fake',
-        }},
     'kinesis': {'DescribeStream': {'StreamName': 'fake'}},
     'kms': {'GetKeyPolicy': {'KeyId': 'fake', 'PolicyName': 'fake'}},
     'lambda': {'Invoke': {'FunctionName': 'fake'}},