[arch-commits] Commit in python-aws-xray-sdk/repos/community-any (4 files)

Chih-Hsuan Yen yan12125 at gemini.archlinux.org
Sat Jul 2 09:30:33 UTC 2022


    Date: Saturday, July 2, 2022 @ 09:30:33
  Author: yan12125
Revision: 1243613

archrelease: copy trunk to community-any

Added:
  python-aws-xray-sdk/repos/community-any/PKGBUILD
    (from rev 1243612, python-aws-xray-sdk/trunk/PKGBUILD)
  python-aws-xray-sdk/repos/community-any/python310.diff
    (from rev 1243612, python-aws-xray-sdk/trunk/python310.diff)
Deleted:
  python-aws-xray-sdk/repos/community-any/PKGBUILD
  python-aws-xray-sdk/repos/community-any/python310.diff

----------------+
 PKGBUILD       |  127 ++++++++++++++++++++++++++++---------------------------
 python310.diff |   72 +++++++++++++++----------------
 2 files changed, 101 insertions(+), 98 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-02 09:30:15 UTC (rev 1243612)
+++ PKGBUILD	2022-07-02 09:30:33 UTC (rev 1243613)
@@ -1,62 +0,0 @@
-# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
-# Contributor: Guillaume Horel <guillaume.horel at gmail.com>
-
-pkgname=python-aws-xray-sdk
-_pkgname=aws-xray-sdk-python
-pkgver=2.9.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)
-depends=(python python-botocore python-future 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-bottle
-              python-webtest python-django-fake-model python-mock python-sqlalchemy
-              python-pytest-benchmark)
-# 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=('03de6e87e46394ea02a9dc605a4038462f41eca9e2e4d39eca6b0cfaa50fa280'
-            '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-any/PKGBUILD (from rev 1243612, python-aws-xray-sdk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-07-02 09:30:33 UTC (rev 1243613)
@@ -0,0 +1,65 @@
+# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
+# Contributor: Guillaume Horel <guillaume.horel at gmail.com>
+
+pkgname=python-aws-xray-sdk
+_pkgname=aws-xray-sdk-python
+pkgver=2.10.0
+pkgrel=1
+pkgdesc='AWS X-Ray SDK for Python'
+arch=(any)
+url='https://github.com/aws/aws-xray-sdk-python'
+license=(Apache)
+# Not including python-future as it's needed only on Python 2
+# https://github.com/aws/aws-xray-sdk-python/pull/343
+depends=(python python-botocore python-wrapt)
+# See extensions in https://github.com/aws/aws-xray-sdk-python/tree/master/aws_xray_sdk/ext
+optdepends=(python-aiobotocore python-aiohttp python-bottle python-django
+            python-flask python-flask-sqlalchemy python-mysql-connector
+            python-pg8000 python-psycopg2 python-pymongo python-pymysql
+            python-pynamodb python-requests python-sqlalchemy)
+makedepends=(python-setuptools ${optdepends[@]})
+checkdepends=(python-pytest python-pytest-aiohttp python-testing.postgresql
+              python-webtest python-django-fake-model python-mock python-pytest-benchmark)
+# 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=('ac44b578718a6d975e980354194e1a4e300f9713bf60b74dbe1ce62efe6dd1ed'
+            '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
+
+  # Django 4.x compatibility; see https://docs.djangoproject.com/en/3.2/ref/urls/#url
+  sed -i 's#from django.conf.urls import url#from django.urls import re_path as url#' tests/ext/django/app/views.py
+
+  # https://github.com/aws/aws-xray-sdk-python/issues/321
+  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
+}

Deleted: python310.diff
===================================================================
--- python310.diff	2022-07-02 09:30:15 UTC (rev 1243612)
+++ python310.diff	2022-07-02 09:30:33 UTC (rev 1243613)
@@ -1,36 +0,0 @@
-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]]
- 

Copied: python-aws-xray-sdk/repos/community-any/python310.diff (from rev 1243612, python-aws-xray-sdk/trunk/python310.diff)
===================================================================
--- python310.diff	                        (rev 0)
+++ python310.diff	2022-07-02 09:30:33 UTC (rev 1243613)
@@ -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]]
+ 



More information about the arch-commits mailing list