From 7b7cf5bd1149dd385a047173347a2d5c984aac01 Mon Sep 17 00:00:00 2001 From: Chih-Hsuan Yen Date: Fri, 1 Mar 2019 17:14:18 +0800 Subject: [PATCH 1/2] Bump idna to 2.8 requests 2.21.0 allows idna 2.8 [1] [1] https://github.com/kennethreitz/requests/commit/8761e9736f7d5508a5547cdf3adecbe0b7306278 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8ac06c4dd..99be632db 100755 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ install_requires = [ "jsondiff==1.1.2", "aws-xray-sdk!=0.96,>=0.93", "responses>=0.9.0", - "idna<2.8,>=2.5", + "idna<2.9,>=2.5", "cfn-lint", ] From 9992e23e68fb7f9fb8e07a163d89069aaf662096 Mon Sep 17 00:00:00 2001 From: Chih-Hsuan Yen Date: Fri, 1 Mar 2019 19:22:26 +0800 Subject: [PATCH 2/2] Fix compatibility with cryptography 2.6 [1] https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst#26---2019-02-27 --- moto/acm/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moto/acm/models.py b/moto/acm/models.py index 39be8945d..15a1bd44d 100644 --- a/moto/acm/models.py +++ b/moto/acm/models.py @@ -243,7 +243,7 @@ class CertBundle(BaseModel): 'KeyAlgorithm': key_algo, 'NotAfter': datetime_to_epoch(self._cert.not_valid_after), 'NotBefore': datetime_to_epoch(self._cert.not_valid_before), - 'Serial': self._cert.serial, + 'Serial': self._cert.serial_number, 'SignatureAlgorithm': self._cert.signature_algorithm_oid._name.upper().replace('ENCRYPTION', ''), 'Status': self.status, # One of PENDING_VALIDATION, ISSUED, INACTIVE, EXPIRED, VALIDATION_TIMED_OUT, REVOKED, FAILED. 'Subject': 'CN={0}'.format(self.common_name),