Date: Wednesday, December 8, 2021 @ 03:45:07
Author: felixonmars
Revision: 1065600
archrelease: copy trunk to community-staging-any
Added:
python-aws-xray-sdk/repos/community-staging-any/PKGBUILD
(from rev 1065599, python-aws-xray-sdk/trunk/PKGBUILD)
python-aws-xray-sdk/repos/community-staging-any/python310.diff
(from rev 1065599, python-aws-xray-sdk/trunk/python310.diff)
Deleted:
python-aws-xray-sdk/repos/community-staging-any/PKGBUILD
----------------+
PKGBUILD | 125 +++++++++++++++++++++++++++----------------------------
python310.diff | 36 +++++++++++++++
2 files changed, 99 insertions(+), 62 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-08 03:44:57 UTC (rev 1065599)
+++ PKGBUILD 2021-12-08 03:45:07 UTC (rev 1065600)
@@ -1,62 +0,0 @@
-# Maintainer: Chih-Hsuan Yen <yan12...@archlinux.org>
-# Contributor: Guillaume Horel <guillaume.ho...@gmail.com>
-
-pkgname=python-aws-xray-sdk
-_pkgname=aws-xray-sdk-python
-pkgver=2.8.0
-pkgrel=3
-pkgdesc='AWS X-Ray SDK for Python'
-arch=(any)
-url='https://github.com/aws/aws-xray-sdk-python'
-license=(Apache)
-# XXX: move setuptools back to makedepends in the next version
-# https://github.com/aws/aws-xray-sdk-python/pull/306
-makedepends=()
-depends=(python python-botocore python-future python-wrapt python-setuptools)
-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-bottle
- python-webtest python-django-fake-model python-mock
python-sqlalchemy)
-# 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";)
-sha256sums=('3f94ee35d8e34022939153dcc6d5bd8bce1428ee4811f0ee4713e40dae8b22dd')
-
-prepare() {
- cd $_pkgname-$pkgver
- # The 'database_version' field relies on a private member in pg8000 [1],
which is removed in pg8000 1.21 [2]
- #
https://github.com/aws/aws-xray-sdk-python/blob/2.8.0/aws_xray_sdk/ext/pg8000/patch.py#L27
- #
https://github.com/tlocke/pg8000/commit/fa382a2da52c004fa9b98b242e855132d3fd6d23#diff-2d43fca8e06901904747dfab40d9a7a698ff03fab4c9ba1c01a8ce04105d537eL799
- sed -i "/sql\['database_version'\]/d" tests/ext/pg8000/test_pg8000.py
-
- # top-level `get_session` is removed by default since aiobotocore 2.0.0
- # https://github.com/aio-libs/aiobotocore/releases/tag/2.0.0
- sed -i -e "s/import aiobotocore$/import aiobotocore.session/g" \
- -e "s/aiobotocore\.get_session/aiobotocore.session.get_session/g"
tests/ext/aiobotocore/test_aiobotocore.py
-}
-
-build() {
- cd $_pkgname-$pkgver
- python setup.py build
-}
-
-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 for pymysql uses testing.mysqld, which is not
- # compatible with MariaDB
- # https://github.com/tk0miya/testing.mysqld/issues/3
- # Tests in test_sqlalchemy_core_2.py need sqlalchemy >= 1.4 [1]
- # https://github.com/aws/aws-xray-sdk-python/pull/289
- pytest -v tests --ignore tests/ext/pymysql \
- --ignore tests/ext/sqlalchemy_core/test_sqlalchemy_core_2.py
-}
-
-package() {
- cd $_pkgname-$pkgver
- python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}
Copied: python-aws-xray-sdk/repos/community-staging-any/PKGBUILD (from rev
1065599, python-aws-xray-sdk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-08 03:45:07 UTC (rev 1065600)
@@ -0,0 +1,63 @@
+# Maintainer: Chih-Hsuan Yen <yan12...@archlinux.org>
+# Contributor: Guillaume Horel <guillaume.ho...@gmail.com>
+
+pkgname=python-aws-xray-sdk
+_pkgname=aws-xray-sdk-python
+pkgver=2.8.0
+pkgrel=4
+pkgdesc='AWS X-Ray SDK for Python'
+arch=(any)
+url='https://github.com/aws/aws-xray-sdk-python'
+license=(Apache)
+# XXX: move setuptools back to makedepends in the next version
+# https://github.com/aws/aws-xray-sdk-python/pull/306
+makedepends=()
+depends=(python python-botocore python-future python-wrapt python-setuptools)
+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-bottle
+ python-webtest python-django-fake-model python-mock
python-sqlalchemy)
+# 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";
+ "python310.diff")
+sha256sums=('3f94ee35d8e34022939153dcc6d5bd8bce1428ee4811f0ee4713e40dae8b22dd'
+ '11784ed0d9b9f89bf1cc43a6d97d8488672b74e3419e121be1a50f09e409ad71')
+
+prepare() {
+ cd $_pkgname-$pkgver
+ # The 'database_version' field relies on a private member in pg8000 [1],
which is removed in pg8000 1.21 [2]
+ #
https://github.com/aws/aws-xray-sdk-python/blob/2.8.0/aws_xray_sdk/ext/pg8000/patch.py#L27
+ #
https://github.com/tlocke/pg8000/commit/fa382a2da52c004fa9b98b242e855132d3fd6d23#diff-2d43fca8e06901904747dfab40d9a7a698ff03fab4c9ba1c01a8ce04105d537eL799
+ sed -i "/sql\['database_version'\]/d" tests/ext/pg8000/test_pg8000.py
+
+ # top-level `get_session` is removed by default since aiobotocore 2.0.0
+ # https://github.com/aio-libs/aiobotocore/releases/tag/2.0.0
+ sed -i -e "s/import aiobotocore$/import aiobotocore.session/g" \
+ -e "s/aiobotocore\.get_session/aiobotocore.session.get_session/g"
tests/ext/aiobotocore/test_aiobotocore.py
+
+ patch -Np1 -i ../python310.diff
+}
+
+build() {
+ cd $_pkgname-$pkgver
+ python setup.py build
+}
+
+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 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() {
+ cd $_pkgname-$pkgver
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
Copied: python-aws-xray-sdk/repos/community-staging-any/python310.diff (from
rev 1065599, python-aws-xray-sdk/trunk/python310.diff)
===================================================================
--- python310.diff (rev 0)
+++ python310.diff 2021-12-08 03:45:07 UTC (rev 1065600)
@@ -0,0 +1,36 @@
+diff --git a/tests/ext/aiohttp/test_middleware.py
b/tests/ext/aiohttp/test_middleware.py
+index c8b2333..4f8cac6 100644
+--- a/tests/ext/aiohttp/test_middleware.py
++++ b/tests/ext/aiohttp/test_middleware.py
+@@ -279,8 +279,7 @@ async def test_concurrent(test_client, loop, recorder):
+
+ await asyncio.wait([get_delay(), get_delay(), get_delay(),
+ get_delay(), get_delay(), get_delay(),
+- get_delay(), get_delay(), get_delay()],
+- loop=loop)
++ get_delay(), get_delay(), get_delay()])
+
+ # Ensure all ID's are different
+ ids = [item.id for item in recorder.emitter.local]
+diff --git a/tests/test_async_local_storage.py
b/tests/test_async_local_storage.py
+index b43cc0e..4b13ffd 100644
+--- a/tests/test_async_local_storage.py
++++ b/tests/test_async_local_storage.py
+@@ -19,7 +19,7 @@ def test_localstorage_isolation(loop):
+ random_int = random.random()
+ local_storage.randint = random_int
+
+- await asyncio.sleep(0.0, loop=loop)
++ await asyncio.sleep(0.0)
+
+ current_random_int = local_storage.randint
+ assert random_int == current_random_int
+@@ -30,7 +30,7 @@ def test_localstorage_isolation(loop):
+
+ # Run loads of concurrent tasks
+ results = loop.run_until_complete(
+- asyncio.wait([_test() for _ in range(0, 100)], loop=loop)
++ asyncio.wait([_test() for _ in range(0, 100)])
+ )
+ results = [item.result() for item in results[0]]
+
