Date: Tuesday, February 25, 2020 @ 06:46:07 Author: yan12125 Revision: 580933
upgpkg: python-aiobotocore 0.12.0-1 Status of patches: * python-aiobotocore-moto-1.3.14.diff: fixed upstream in https://github.com/aio-libs/aiobotocore/commit/345b8e1347fdc2c0631499a83ed4aeeb5a4c5351#diff-7284b7b6d134f571f22d8d7cce5f4bba * fix-tests-with-proxies.patch: this was for special network configuration for reproducible build test environments [1]. Tests are no longer run since [2], so this patch can be removed. Changes in dependencies: * async_generator is replaced by aioitertools [3] [1] https://tests.reproducible-builds.org/archlinux/archlinux.html [2] https://salsa.debian.org/qa/jenkins.debian.net/-/commit/e16b3ee7c55d2fc7cf0833838cfe5a7a806ee2d2 [3] https://github.com/aio-libs/aiobotocore/commit/01269ab8c5e886546d3d32991772cfefa0eebfd2#diff-2eeaed663bd0d25b7e608891384b7298R13 Modified: python-aiobotocore/trunk/PKGBUILD Deleted: python-aiobotocore/trunk/fix-tests-with-proxies.patch python-aiobotocore/trunk/python-aiobotocore-moto-1.3.14.diff -------------------------------------+ PKGBUILD | 23 +++++++---------------- fix-tests-with-proxies.patch | 30 ------------------------------ python-aiobotocore-moto-1.3.14.diff | 22 ---------------------- 3 files changed, 7 insertions(+), 68 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-02-25 06:24:15 UTC (rev 580932) +++ PKGBUILD 2020-02-25 06:46:07 UTC (rev 580933) @@ -2,33 +2,24 @@ pkgname=python-aiobotocore _pkgname=aiobotocore -pkgver=0.11.1 +pkgver=0.12.0 pkgrel=1 pkgdesc='asyncio support for botocore library using aiohttp' arch=(any) url='https://github.com/aio-libs/aiobotocore' license=(Apache) -depends=(python python-aiohttp python-botocore python-wrapt python-async_generator) +depends=(python python-aiohttp python-botocore python-wrapt python-aioitertools) checkdepends=(python-flask python-moto python-pytest python-pytest-asyncio) -source=("https://github.com/aio-libs/aiobotocore/archive/$pkgver/$pkgname-$pkgver.tar.gz" - fix-tests-with-proxies.patch - $pkgname-moto-1.3.14.diff) -sha256sums=('2fd5787ff73a945f7f42f78cc0322d066f570254a805e7c02854895e45f61860' - '248aee05a468848dda2c40185f49714ebe8b789913dd7bb49018d69f1f3606f7' - '94b560d753ac31709e9ffb3771759561979e061772de1789f7dfe102fe01ca8c') +source=("https://github.com/aio-libs/aiobotocore/archive/$pkgver/$pkgname-$pkgver.tar.gz") +sha256sums=('fa73d5f1306d30c827c7b229648c3a4c6797ee71d4a97de4f7a579b144d82338') prepare() { cd $_pkgname-$pkgver - 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 - rm -v tests/test_patches.py - sed -i -r "s#'(botocore.*),<.*',#'\1',#" setup.py + sed --in-place=.orig -r "s#'(botocore.*),<.*',#'\1',#" setup.py + diff -u setup.py{.orig,} || true } build() { @@ -39,7 +30,7 @@ check() { cd $_pkgname-$pkgver - PYTHONPATH=build/lib pytest -v -m moto tests + PYTHONPATH="$PWD/build/lib:$PWD" pytest -v -m moto tests --ignore=tests/test_patches.py } package() { Deleted: fix-tests-with-proxies.patch =================================================================== --- fix-tests-with-proxies.patch 2020-02-25 06:24:15 UTC (rev 580932) +++ fix-tests-with-proxies.patch 2020-02-25 06:46:07 UTC (rev 580933) @@ -1,30 +0,0 @@ -diff --git a/tests/conftest.py b/tests/conftest.py -index 2af2ff7..14c2974 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -71,18 +71,20 @@ async def assert_num_uploads_found( - @pytest.fixture - def aa_fail_proxy_config(monkeypatch): - # NOTE: name of this fixture must be alphabetically first to run first -- monkeypatch.setenv('HTTP_PROXY', 'http://localhost:54321') -- monkeypatch.setenv('HTTPS_PROXY', 'http://localhost:54321') -+ monkeypatch.setenv('http_proxy', 'http://localhost:54321') -+ monkeypatch.setenv('https_proxy', 'http://localhost:54321') -+ -+ monkeypatch.delenv('no_proxy', raising=False) - - - @pytest.fixture - def aa_succeed_proxy_config(monkeypatch): - # NOTE: name of this fixture must be alphabetically first to run first -- monkeypatch.setenv('HTTP_PROXY', 'http://localhost:54321') -- monkeypatch.setenv('HTTPS_PROXY', 'http://localhost:54321') -+ monkeypatch.setenv('http_proxy', 'http://localhost:54321') -+ monkeypatch.setenv('https_proxy', 'http://localhost:54321') - - # this will cause us to skip proxying -- monkeypatch.setenv('NO_PROXY', 'amazonaws.com') -+ monkeypatch.setenv('no_proxy', 'amazonaws.com') - - - @pytest.fixture Deleted: python-aiobotocore-moto-1.3.14.diff =================================================================== --- python-aiobotocore-moto-1.3.14.diff 2020-02-25 06:24:15 UTC (rev 580932) +++ python-aiobotocore-moto-1.3.14.diff 2020-02-25 06:46:07 UTC (rev 580933) @@ -1,22 +0,0 @@ -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'