Date: Friday, April 17, 2020 @ 04:19:30 Author: yan12125 Revision: 615404
upgpkg: python-aws-xray-sdk 2.5.0-1 * Enable Django tests after they're fixed upstream [1] * Drop pypandoc - lots of Haskell packages in dependencies * aiobotocore patch is included in this release [1] https://github.com/aws/aws-xray-sdk-python/pull/10 [2] https://github.com/aws/aws-xray-sdk-python/pull/205 Modified: python-aws-xray-sdk/trunk/PKGBUILD Deleted: python-aws-xray-sdk/trunk/aiobotocore-0.12.patch ------------------------+ PKGBUILD | 25 ++++++++--------- aiobotocore-0.12.patch | 69 ----------------------------------------------- 2 files changed, 13 insertions(+), 81 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-04-17 04:12:41 UTC (rev 615403) +++ PKGBUILD 2020-04-17 04:19:30 UTC (rev 615404) @@ -3,26 +3,24 @@ pkgname=python-aws-xray-sdk _pkgname=aws-xray-sdk-python -pkgver=2.4.3 -pkgrel=2 +pkgver=2.5.0 +pkgrel=1 pkgdesc='AWS X-Ray SDK for Python' arch=(any) url='https://github.com/aws/aws-xray-sdk-python' license=(Apache) -makedepends=(python-setuptools python-pypandoc) +makedepends=(python-setuptools) depends=(python python-botocore python-future python-jsonpickle python-wrapt) checkdepends=(python-flask-sqlalchemy python-pynamodb python-pytest python-aiohttp python-pytest-aiohttp python-testing.postgresql python-psycopg2 - python-pg8000 python-requests python-aiobotocore) + python-pg8000 python-requests python-aiobotocore python-bottle + python-webtest python-django-fake-model) # Not using PyPI source tarball as it does not include tests -source=("https://github.com/aws/aws-xray-sdk-python/archive/$pkgver/$pkgname-$pkgver.tar.gz" - aiobotocore-0.12.patch) -sha256sums=('adb528c7c092293613484ca28c5466c79889ff6035493681daf9fbde9ba95b3a' - '20d99cfbf6675f2b2d8147b5e4bc218de5666b0c0629d3fea8fb9a39b66c4d8b') +source=("https://github.com/aws/aws-xray-sdk-python/archive/$pkgver/$pkgname-$pkgver.tar.gz") +sha256sums=('70fd26080462087f4f20fcbff11c3bc125bcded9f96b8203b4e5773418c204ef') prepare() { cd $_pkgname-$pkgver - patch -Np1 -i ../aiobotocore-0.12.patch } build() { @@ -33,12 +31,15 @@ check() { cd $_pkgname-$pkgver + # See setenv= in upstream tox.ini + export DJANGO_SETTINGS_MODULE=tests.ext.django.app.settings export AWS_SECRET_ACCESS_KEY=fake_key export AWS_ACCESS_KEY_ID=fake_id - # the test suite is not compatible with Django 2.x yet - # https://github.com/aws/aws-xray-sdk-python/issues/85 - pytest -v --ignore tests/ext/django + # the test suite for pymysql uses testing.mysqld, which is not + # compatible with MariaDB + # https://github.com/tk0miya/testing.mysqld/issues/3 + pytest -v tests --ignore tests/ext/pymysql } package() { Deleted: aiobotocore-0.12.patch =================================================================== --- aiobotocore-0.12.patch 2020-04-17 04:12:41 UTC (rev 615403) +++ aiobotocore-0.12.patch 2020-04-17 04:19:30 UTC (rev 615404) @@ -1,69 +0,0 @@ -From 3f2ba2d4b6973ea7234f82154ebcaf4b8d53cc99 Mon Sep 17 00:00:00 2001 -From: Prashant Srivastava <srpr...@amazon.com> -Date: Tue, 25 Feb 2020 14:27:29 -0800 -Subject: [PATCH] Dropping loop parameter from aiobotocore.get_session() due to - new aiobotocore 0.12.0 changes - ---- - tests/ext/aiobotocore/test_aiobotocore.py | 12 ++++++------ - tox.ini | 3 ++- - 2 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/tests/ext/aiobotocore/test_aiobotocore.py b/tests/ext/aiobotocore/test_aiobotocore.py -index 6b14ea5..4389c8f 100644 ---- a/tests/ext/aiobotocore/test_aiobotocore.py -+++ b/tests/ext/aiobotocore/test_aiobotocore.py -@@ -28,7 +28,7 @@ def recorder(loop): - req_id = '1234' - response = {'ResponseMetadata': {'RequestId': req_id, 'HTTPStatusCode': 403}} - -- session = aiobotocore.get_session(loop=loop) -+ session = aiobotocore.get_session() - async with session.create_client('dynamodb', region_name='eu-west-2') as client: - with Stubber(client) as stubber: - stubber.add_response('describe_table', response, {'TableName': 'mytable'}) -@@ -53,7 +53,7 @@ def recorder(loop): - version_id = 'myversionid' - response = {'ResponseMetadata': {'RequestId': '1234', 'HTTPStatusCode': 200}} - -- session = aiobotocore.get_session(loop=loop) -+ session = aiobotocore.get_session() - async with session.create_client('s3', region_name='eu-west-2') as client: - with Stubber(client) as stubber: - stubber.add_response('get_object', response, -@@ -87,7 +87,7 @@ def recorder(loop): - } - } - -- session = aiobotocore.get_session(loop=loop) -+ session = aiobotocore.get_session() - async with session.create_client('sqs', region_name='eu-west-2') as client: - with Stubber(client) as stubber: - stubber.add_response('list_queues', response, {'QueueNamePrefix': queue_name_prefix}) -@@ -117,7 +117,7 @@ def recorder(loop): - } - } - -- session = aiobotocore.get_session(loop=loop) -+ session = aiobotocore.get_session() - async with session.create_client('dynamodb', region_name='eu-west-2') as client: - with Stubber(client) as stubber: - stubber.add_response('batch_write_item', response, {'RequestItems': ANY}) -@@ -137,7 +137,7 @@ def recorder(loop): - - response = {'ResponseMetadata': {'RequestId': '1234', 'HTTPStatusCode': 403}} - -- session = aiobotocore.get_session(loop=loop) -+ session = aiobotocore.get_session() - async with session.create_client('dynamodb', region_name='eu-west-2') as client: - with Stubber(client) as stubber: - stubber.add_response('describe_table', response, {'TableName': 'mytable'}) -@@ -150,7 +150,7 @@ def recorder(loop): - xray_recorder.configure(service='test', sampling=False, - context=AsyncContext(loop=loop), context_missing='LOG_ERROR') - -- session = aiobotocore.get_session(loop=loop) -+ session = aiobotocore.get_session() - async with session.create_client('dynamodb', region_name='eu-west-2') as client: - with Stubber(client) as stubber: - stubber.add_client_error('describe_table', expected_params={'TableName': ANY})