upgpkg: python-aws-xray-sdk 2.11.0-1

* Switch to upstream patches
* Switch sources to git repo for easier backporting
* Cleanup comments
* Add httpx for [1]
* Disable broken tests

[1] aws/aws-xray-sdk-python#357

git-svn-id: file:///srv/repos/svn-community/svn@1346564 9fca08f4-af9d-4005-b8df-a31f2cc04f65

Author: yan12125

trunk/PKGBUILD

@@ -3,41 +3,49 @@
 
 pkgname=python-aws-xray-sdk
 _pkgname=aws-xray-sdk-python
-pkgver=2.10.0
+pkgver=2.11.0
+_commit=b37ae1100350780a3862297fe9d2c364bb39510f
 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-flask python-flask-sqlalchemy python-httpx 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-asyncio python-pytest-aiohttp python-testing.postgresql
+makedepends=(git python-setuptools ${optdepends[@]})
+checkdepends=(python-pytest python-pytest-asyncio 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')
+source=("git+https://github.com/aws/aws-xray-sdk-python.git#commit=$_commit")
+sha256sums=('SKIP')
 
-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
+_backports=(
+  # The following three are from https://github.com/aws/aws-xray-sdk-python/pull/364 (ongoing)
+  # Use fixture event_loop instead of the deprecated fixture loop
+  72dcbf97a27a44e87123630fe78ff828eafa4d4c
+  # Do not pass event loop to asyncio.sleep() and wait() on Python 3.8+
+  dde50155e7a912aef80199a1d0c2e9900002af5f
+  # Do not pass coroutine objects directly to asyncio.wait()
+  b3d605d145dda82b9bcaa2fdac7eb593770886b2
+)
+
+pkgver() {
+  cd $_pkgname
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
 
-  # 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
+prepare() {
+  cd $_pkgname
 
-  # https://github.com/aws/aws-xray-sdk-python/issues/321
-  patch -Np1 -i ../python310.diff
+  # this loop is stolen from core/systemd :)
+  local _c
+  for _c in "${_backports[@]}"; do
+    git log --oneline -1 "${_c}"
+    git cherry-pick -n "${_c}"
+  done
 
   cat > pytest.ini <<EOF
 [pytest]
@@ -46,12 +54,12 @@ EOF
 }
 
 build() {
-  cd $_pkgname-$pkgver
+  cd $_pkgname
   python setup.py build
 }
 
 check() {
-  cd $_pkgname-$pkgver
+  cd $_pkgname
 
   # See setenv= in upstream tox.ini
   export DJANGO_SETTINGS_MODULE=tests.ext.django.app.settings
@@ -62,12 +70,16 @@ check() {
   #   dropped in the latest pytest-aiohttp
   # * the test suite for pymysql uses testing.mysqld, which is not
   #   compatible with MariaDB [1]
+  # * tests fail with pg8000 > 1.20.0 and upstream explicitly
+  #   states no support [2]
   # [1] https://github.com/tk0miya/testing.mysqld/issues/3
+  # [2] https://github.com/aws/aws-xray-sdk-python/pull/324
   pytest -v tests --ignore tests/ext/aiohttp \
+                  --ignore tests/ext/pg8000 \
                   --ignore tests/ext/pymysql
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $_pkgname
   python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 }