Date: Friday, November 15, 2019 @ 18:12:33 Author: yan12125 Revision: 529273
upgpkg: python-aiobotocore 0.11.0-2 - add a workaround for testing against moto 1.3.14 Added: python-aiobotocore/trunk/python-aiobotocore-moto-1.3.14.diff Modified: python-aiobotocore/trunk/PKGBUILD Deleted: python-aiobotocore/trunk/moto-1.3.8.patch -------------------------------------+ PKGBUILD | 14 ++++++++------ moto-1.3.8.patch | 26 -------------------------- python-aiobotocore-moto-1.3.14.diff | 22 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 32 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-15 18:10:18 UTC (rev 529272) +++ PKGBUILD 2019-11-15 18:12:33 UTC (rev 529273) @@ -3,7 +3,7 @@ pkgname=python-aiobotocore _pkgname=aiobotocore pkgver=0.11.0 -pkgrel=1 +pkgrel=2 pkgdesc='asyncio support for botocore library using aiohttp' arch=(any) url='https://github.com/aio-libs/aiobotocore' @@ -11,17 +11,19 @@ depends=(python python-aiohttp python-botocore python-wrapt python-async_generator) checkdepends=(python-flask python-moto python-pytest python-pytest-asyncio) source=("https://github.com/aio-libs/aiobotocore/archive/$pkgver/$pkgname-$pkgver.tar.gz"; - moto-1.3.8.patch - fix-tests-with-proxies.patch) + fix-tests-with-proxies.patch + $pkgname-moto-1.3.14.diff) sha256sums=('e2f2ff362745250524df961e50a42fdd0625ac5b3411b49f492d2f828ca9fcaa' - '7953b9cf8b4256cf0020098a978ef5c48097dfbaafe1c2cbf22d590ed1b07e5c' - '248aee05a468848dda2c40185f49714ebe8b789913dd7bb49018d69f1f3606f7') + '248aee05a468848dda2c40185f49714ebe8b789913dd7bb49018d69f1f3606f7' + '94b560d753ac31709e9ffb3771759561979e061772de1789f7dfe102fe01ca8c') prepare() { cd $_pkgname-$pkgver - patch -Np1 -i ../moto-1.3.8.patch patch -Np1 -i ../fix-tests-with-proxies.patch + # Workaround removal of DEFAULT_TOPIC_POLICY from moto.sns.models + # See: https://github.com/spulec/moto/pull/2517 + patch -Np1 -i ../$pkgname-moto-1.3.14.diff # Disable dependency pinning # Upstream tracking issue: https://github.com/aio-libs/aiobotocore/issues/670 Deleted: moto-1.3.8.patch =================================================================== --- moto-1.3.8.patch 2019-11-15 18:10:18 UTC (rev 529272) +++ moto-1.3.8.patch 2019-11-15 18:12:33 UTC (rev 529273) @@ -1,26 +0,0 @@ ---- aiobotocore-0.10.2/tests/test_basic_s3.py.orig 2019-05-06 21:25:17.837243558 +0800 -+++ aiobotocore-0.10.2/tests/test_basic_s3.py 2019-05-06 21:25:24.003906932 +0800 -@@ -311,6 +311,7 @@ - assert data == b'foo' - - [email protected](reason='Incompatible with moto 1.3.8') - @pytest.mark.moto - @pytest.mark.asyncio - async def test_copy_with_query_string(s3_client, create_object, bucket_name): -@@ -329,6 +330,7 @@ - assert data == b'foo' - - [email protected](reason='Incompatible with moto 1.3.8') - @pytest.mark.moto - @pytest.mark.asyncio - async def test_can_copy_with_dict_form(s3_client, create_object, bucket_name): -@@ -347,6 +349,7 @@ - assert data == b'foo' - - [email protected](reason='Incompatible with moto 1.3.8') - @pytest.mark.moto - @pytest.mark.asyncio - async def test_can_copy_with_dict_form_with_version( Added: python-aiobotocore-moto-1.3.14.diff =================================================================== --- python-aiobotocore-moto-1.3.14.diff (rev 0) +++ python-aiobotocore-moto-1.3.14.diff 2019-11-15 18:12:33 UTC (rev 529273) @@ -0,0 +1,22 @@ +diff --git a/tests/test_sns.py b/tests/test_sns.py +index e008192..639f0b7 100644 +--- a/tests/test_sns.py ++++ b/tests/test_sns.py +@@ -2,8 +2,6 @@ import json + import pytest + import botocore + +-from moto.sns.models import DEFAULT_TOPIC_POLICY +- + + @pytest.mark.moto + @pytest.mark.asyncio +@@ -17,7 +15,7 @@ async def test_topic_attributes(sns_client, topic_arn): + attributes = topic_properties['Attributes'] + + assert arn1 == topic_arn +- assert json.loads(attributes['Policy']) == DEFAULT_TOPIC_POLICY ++ assert json.loads(attributes['Policy']) + assert attributes['DisplayName'] == '' + + display_name = 'My display name'
