From feb0daf81d888e9160f9f94502de09b66f2a63fd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jun 2020 17:50:24 +0100 Subject: gentoo resync : 21.06.2020 --- dev-python/moto/Manifest | 3 ++- dev-python/moto/files/moto-1.3.14-py39.patch | 38 ++++++++++++++++++++++++++++ dev-python/moto/moto-1.3.14-r1.ebuild | 3 ++- 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 dev-python/moto/files/moto-1.3.14-py39.patch (limited to 'dev-python/moto') diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest index 548346209740..8a9f0d07cd69 100644 --- a/dev-python/moto/Manifest +++ b/dev-python/moto/Manifest @@ -1,7 +1,8 @@ AUX moto-1.3.14-newer-botocore.patch 2398 BLAKE2B ea5ebf10d926cca1e9e5a804317bb9b9e82ddbe14d25668f7d375c782b9868e16c11566a4b5de83c855001c2ab059c25566d2ebc32f614875f2b10ce39c3a40f SHA512 35602f3403f2e6e6ff33ffa3054d88ad84eec47731c22211eeaa45d12a7b9181e3710c15a820db060b4f3ad49e4d18e4433066755c649d09a5e82702f08b0f83 +AUX moto-1.3.14-py39.patch 1372 BLAKE2B 620592a897b8f2ddf1973fa3f00a7c2c2512d3da02bf7f5a1474e6f8a934815cdaf00951898af292ebc5b38a0cc961d685c59fd8dd952d5fbe64dcff086d9d19 SHA512 336d9c1d399d2969cc603a3070285ebd4cc2f58bd8fa8d477fd6bde8cfc9a9a873c15b98fd2814f8c3b1cf591826101c024658f5b4468f40e6beaa229c8c8f50 AUX moto-1.3.14-tests.patch 2306 BLAKE2B 83bf272204ba9128623ad13bfb4a468d6b2a4e5de89633b7915d2090be44b4a7823ca88ea6a706fd878e40434335a3d381e28b88806f7ed5f402fdb9977837a0 SHA512 549e1e6715f04b56729f5621f2806e8b9192ec9fd6e5bd4cacfdf4a1a5ee48ed8701f0a9acb5b1cc08e40efa4d3dc1ad5ff0821c794e97a9da6288dd3cd1be5a DIST moto-1.3.14.tar.gz 1829165 BLAKE2B 2ec30c4cc571492a9d2c08f66a39ad04cfc0baa7864db8a5be4ea9af24ecb59bad3e85c44fa8a7babc16bf66188cb6bef89484f1f302a11e6eec1f8dbf516492 SHA512 1fe7e9d49dadada82f24d6bef1c21419c414e027c21ed1099bd1eab7c269ac5638ed44a29d1557b37562a44b22a7c7251fc1ca8ba88cde6b82d39dbc620aa6a6 DIST moto-1.3.8.tar.gz 1571716 BLAKE2B 8e79808d8488bcf8c15e8b5a55e93392ceb5f642f1f52c0af441cecb7adfe23a718f6d283e473e5dab82ddd21bcbed36ecb52b444cbd933405d13c8818e4f74d SHA512 901556249a2a28885b7f77e9f2c209b06391efcea66b78ce3c16edec14bcd03b251c37ef5d800d8f7a35180d59ce7568a68bcebf18e25b092eb5de801db6c587 -EBUILD moto-1.3.14-r1.ebuild 2739 BLAKE2B 1321dc8d002c7e50b0165158613cb8867f5d248ef30ac6265566da73046725e989d2a5abed8077cabc349aa246e048b05e716443407e763873d119a97dc154ef SHA512 9729920041d55f8cb9aa1fd616a60139c151ff3a248798d3f83cfe191cdea2b9bb5226d017a3e5db6cbf9e2c5569df78d7c14c472fe3abefec184a23a317f309 +EBUILD moto-1.3.14-r1.ebuild 2776 BLAKE2B 1cea7381d46c92c8411e62717b1fad20465ac479cdb0c92c8d3b6b9bd16f838728097f92d2e62de079b61d1dd91b4728de03baabb08552817a7531636a565a94 SHA512 7838e1967746d2d41970dc649a6671d1d4420a51c259f4b8b65294f10c80b0ec453260a6e934b241175e348e680670e7aa2d2b4a23636f914c71927d9e805218 EBUILD moto-1.3.8-r1.ebuild 2428 BLAKE2B da88df8c1a6c5d180277821ddd25da4d7d6e59e234c8d83663185a26d19233d989c074fca40ad7200617f73f799cbaecdbb96a0e0b1d2b9e3c70c31b7b6d13c4 SHA512 114b88548e04b616ee787bb96c338dda79f66942b58f9072519ec3274196358bc7cc658e675c5cbc3beaaf219b4f54044b06ddcf366f8902852307504b17f440 MISC metadata.xml 486 BLAKE2B 5fbd350934c9a51d9b34d57a4031b6180acad41a2f981465b8ce78b76cf2ed25679fc4b5e9af59dab1e27cfe0eff2856419394902bcca26a2ffb7ece199d1838 SHA512 9e69d49c588ebbeef151cee987986de7a942a3daa9bf4d4f442314d7e47bd1ad8650c6190c6313e6f4303c03038313b6562d5e0a32ec536227c04e7702ef316f diff --git a/dev-python/moto/files/moto-1.3.14-py39.patch b/dev-python/moto/files/moto-1.3.14-py39.patch new file mode 100644 index 000000000000..de00028179fa --- /dev/null +++ b/dev-python/moto/files/moto-1.3.14-py39.patch @@ -0,0 +1,38 @@ +From af66a281ee2bcc7cc6c48bb3c8d033d385c12875 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sun, 14 Jun 2020 12:31:00 +0200 +Subject: [PATCH] Fix use of base64.decodestring() in tests + +Use base64.decodebytes() instead of deprecated/removed .decodestring() +in test_user_data_with_run_instance(). Fixes tests on py3.9. +--- + tests/test_ec2/test_instances.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/tests/test_ec2/test_instances.py b/tests/test_ec2/test_instances.py +index 041bc8c8..1def1734 100644 +--- a/tests/test_ec2/test_instances.py ++++ b/tests/test_ec2/test_instances.py +@@ -9,6 +9,7 @@ from nose.tools import assert_raises + import base64 + import datetime + import ipaddress ++import sys + + import six + import boto +@@ -765,7 +766,10 @@ def test_user_data_with_run_instance(): + instance_attribute = instance.get_attribute("userData") + instance_attribute.should.be.a(InstanceAttribute) + retrieved_user_data = instance_attribute.get("userData").encode("utf-8") +- decoded_user_data = base64.decodestring(retrieved_user_data) ++ if sys.version_info[0] == 2: ++ decoded_user_data = base64.decodestring(retrieved_user_data) ++ else: ++ decoded_user_data = base64.decodebytes(retrieved_user_data) + decoded_user_data.should.equal(b"some user data") + + +-- +2.27.0 + diff --git a/dev-python/moto/moto-1.3.14-r1.ebuild b/dev-python/moto/moto-1.3.14-r1.ebuild index e73600eb1550..71f3637af836 100644 --- a/dev-python/moto/moto-1.3.14-r1.ebuild +++ b/dev-python/moto/moto-1.3.14-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6..9} ) DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 @@ -59,6 +59,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/moto-1.3.14-newer-botocore.patch" "${FILESDIR}/moto-1.3.14-tests.patch" + "${FILESDIR}/moto-1.3.14-py39.patch" ) distutils_enable_tests nose -- cgit v1.2.3