Merge branch 'release-1.18.25'

* release-1.18.25:
  Bumping version to 1.18.25
  Add changelog entries from botocore
  Replace deprecated unittest aliases (#2965)

Author: aws-sdk-python-automation

.changes/1.18.25.json

@@ -0,0 +1,22 @@
+[
+  {
+    "category": "``ec2``",
+    "description": "[``botocore``] The ImportImage API now supports the ability to create AMIs with AWS-managed licenses for Microsoft SQL Server for both Windows and Linux.",
+    "type": "api-change"
+  },
+  {
+    "category": "``memorydb``",
+    "description": "[``botocore``] AWS MemoryDB  SDK now supports all APIs for newly launched MemoryDB service.",
+    "type": "api-change"
+  },
+  {
+    "category": "``application-autoscaling``",
+    "description": "[``botocore``] This release extends Application Auto Scaling support for replication group of Amazon ElastiCache Redis clusters. Auto Scaling monitors and automatically expands node group count and number of replicas per node group when a critical usage threshold is met or according to customer-defined schedule.",
+    "type": "api-change"
+  },
+  {
+    "category": "``appflow``",
+    "description": "[``botocore``] This release adds support for SAPOData connector and extends Veeva connector for document extraction.",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+1.18.25
+=======
+
+* api-change:``ec2``: [``botocore``] The ImportImage API now supports the ability to create AMIs with AWS-managed licenses for Microsoft SQL Server for both Windows and Linux.
+* api-change:``memorydb``: [``botocore``] AWS MemoryDB  SDK now supports all APIs for newly launched MemoryDB service.
+* api-change:``application-autoscaling``: [``botocore``] This release extends Application Auto Scaling support for replication group of Amazon ElastiCache Redis clusters. Auto Scaling monitors and automatically expands node group count and number of replicas per node group when a critical usage threshold is met or according to customer-defined schedule.
+* api-change:``appflow``: [``botocore``] This release adds support for SAPOData connector and extends Veeva connector for document extraction.
+
+
 1.18.24
 =======
 

boto3/__init__.py

@@ -18,7 +18,7 @@
 
 
 __author__ = 'Amazon Web Services'
-__version__ = '1.18.24'
+__version__ = '1.18.25'
 
 
 # The default Boto3 session; autoloaded when needed.

setup.cfg

@@ -3,7 +3,7 @@ universal = 0
 
 [metadata]
 requires_dist =
-    botocore>=1.21.24,<1.22.0
+    botocore>=1.21.25,<1.22.0
     jmespath>=0.7.1,<1.0.0
     s3transfer>=0.5.0,<0.6.0
 

setup.py

@@ -14,7 +14,7 @@
 
 
 requires = [
-    'botocore>=1.21.24,<1.22.0',
+    'botocore>=1.21.25,<1.22.0',
     'jmespath>=0.7.1,<1.0.0',
     's3transfer>=0.5.0,<0.6.0'
 ]

tests/functional/test_resource.py

@@ -45,7 +45,7 @@ def test_has_good_error_message_when_no_resource(self):
         err_regex = (
             '%s.*resource does not exist.' % bad_resource_name
         )
-        with self.assertRaisesRegexp(ResourceNotExistsError, err_regex):
+        with self.assertRaisesRegex(ResourceNotExistsError, err_regex):
             boto3.resource(bad_resource_name)
 
 

tests/unit/dynamodb/test_conditions.py

@@ -35,17 +35,17 @@ def setUp(self):
         self.value2 = 'foo2'
 
     def test_and(self):
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
                 DynamoDBOperationNotSupportedError, 'AND'):
             self.attr & self.attr2
 
     def test_or(self):
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
                 DynamoDBOperationNotSupportedError, 'OR'):
             self.attr | self.attr2
 
     def test_not(self):
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
                 DynamoDBOperationNotSupportedError, 'NOT'):
             ~self.attr
 
@@ -243,7 +243,7 @@ def test_and_operator(self):
 
     def test_and_operator_throws_excepetion(self):
         cond1 = Equals(self.value, self.value2)
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
                 DynamoDBOperationNotSupportedError, 'AND'):
             cond1 & self.value2
 
@@ -254,7 +254,7 @@ def test_or_operator(self):
 
     def test_or_operator_throws_excepetion(self):
         cond1 = Equals(self.value, self.value2)
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
                 DynamoDBOperationNotSupportedError, 'OR'):
             cond1 | self.value2
 

tests/unit/dynamodb/test_types.py

@@ -61,7 +61,7 @@ def setUp(self):
         self.serializer = TypeSerializer()
 
     def test_serialize_unsupported_type(self):
-        with self.assertRaisesRegexp(TypeError, 'Unsupported type'):
+        with self.assertRaisesRegex(TypeError, 'Unsupported type'):
             self.serializer.serialize(object())
 
     def test_serialize_null(self):
@@ -78,13 +78,13 @@ def test_serialize_decimal(self):
             self.serializer.serialize(Decimal('1.25')), {'N': '1.25'})
 
     def test_serialize_float_error(self):
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
                 TypeError,
                 'Float types are not supported. Use Decimal types instead'):
             self.serializer.serialize(1.25)
 
     def test_serialize_NaN_error(self):
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
                 TypeError,
                 'Infinity and NaN not supported'):
             self.serializer.serialize(Decimal('NaN'))
@@ -155,11 +155,11 @@ def setUp(self):
         self.deserializer = TypeDeserializer()
 
     def test_deserialize_invalid_type(self):
-        with self.assertRaisesRegexp(TypeError, 'FOO is not supported'):
+        with self.assertRaisesRegex(TypeError, 'FOO is not supported'):
             self.deserializer.deserialize({'FOO': 'bar'})
 
     def test_deserialize_empty_structure(self):
-        with self.assertRaisesRegexp(TypeError, 'Value must be a nonempty'):
+        with self.assertRaisesRegex(TypeError, 'Value must be a nonempty'):
             self.assertEqual(self.deserializer.deserialize({}), {})
 
     def test_deserialize_null(self):

tests/unit/resources/test_factory.py

@@ -685,8 +685,8 @@ def test_hash_resource_not_equal(self):
         p = resource.Queue('test1')
         q = resource.Queue('test2')
 
-        self.assertNotEquals(p, q, "Should not be equal resource")
-        self.assertNotEquals(hash(p), hash(q), "Hash values should be different")
+        self.assertNotEqual(p, q, "Should not be equal resource")
+        self.assertNotEqual(hash(p), hash(q), "Hash values should be different")
 
     def test_dangling_resource_create_with_kwarg(self):
         resource = self.load('test', self.model, self.defs)()