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

[Chih-Hsuan Yen]

    Date: Saturday, August 17, 2019 @ 13:40:58
  Author: yan12125
Revision: 499979

archrelease: copy trunk to community-testing-any

Added:
  python-aws-xray-sdk/repos/community-testing-any/
  python-aws-xray-sdk/repos/community-testing-any/PKGBUILD
    (from rev 499978, python-aws-xray-sdk/trunk/PKGBUILD)
  python-aws-xray-sdk/repos/community-testing-any/aws-xray-sdk-pynamodb4.patch
    (from rev 499978, python-aws-xray-sdk/trunk/aws-xray-sdk-pynamodb4.patch)

------------------------------+
 PKGBUILD                     |   51 +++++++++++++++++++++++++++++++++++++++++
 aws-xray-sdk-pynamodb4.patch |   24 +++++++++++++++++++
 2 files changed, 75 insertions(+)

Copied: python-aws-xray-sdk/repos/community-testing-any/PKGBUILD (from rev 499978, python-aws-xray-sdk/trunk/PKGBUILD)
===================================================================
--- community-testing-any/PKGBUILD	                        (rev 0)
+++ community-testing-any/PKGBUILD	2019-08-17 13:40:58 UTC (rev 499979)
@@ -0,0 +1,51 @@
+# 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.4.2
+pkgrel=3
+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)
+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)
+# 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"
+        "aws-xray-sdk-psycopg2.8.patch"::"https://github.com/aws/aws-xray-sdk-python/commit/4b4422a3ad9bb9a28399b34851dd574f6155bb66.patch"
+        "aws-xray-sdk-pynamodb4.patch")
+sha256sums=('e480a6dc21d314faf6a9af4cf871fd7b782fae1e704e0fe5977161707f101374'
+            'b0740901e4c3bd0a678b217b1121c5f827e8535722a560d9f84fb9a8b90f8f74'
+            'e894f6c30b00126cbf2023fdef5c774827a99e8450d4c79e8abfdabed2d2868b')
+
+prepare() {
+  cd $_pkgname-$pkgver
+  patch -Np1 -i ../aws-xray-sdk-psycopg2.8.patch
+  # https://github.com/aws/aws-xray-sdk-python/issues/171
+  patch -Np1 -i ../aws-xray-sdk-pynamodb4.patch
+}
+
+build() {
+  cd $_pkgname-$pkgver
+  python setup.py build
+}
+
+check() {
+  cd $_pkgname-$pkgver
+
+  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
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}

Copied: python-aws-xray-sdk/repos/community-testing-any/aws-xray-sdk-pynamodb4.patch (from rev 499978, python-aws-xray-sdk/trunk/aws-xray-sdk-pynamodb4.patch)
===================================================================
--- community-testing-any/aws-xray-sdk-pynamodb4.patch	                        (rev 0)
+++ community-testing-any/aws-xray-sdk-pynamodb4.patch	2019-08-17 13:40:58 UTC (rev 499979)
@@ -0,0 +1,24 @@
+diff --git a/aws_xray_sdk/ext/pynamodb/patch.py b/aws_xray_sdk/ext/pynamodb/patch.py
+index 8815cc3..a5e462f 100644
+--- a/aws_xray_sdk/ext/pynamodb/patch.py
++++ b/aws_xray_sdk/ext/pynamodb/patch.py
+@@ -16,8 +16,8 @@ def patch():
+     setattr(botocore.vendored.requests.sessions, '_xray_enabled', True)
+ 
+     wrapt.wrap_function_wrapper(
+-        'botocore.vendored.requests.sessions',
+-        'Session.send',
++        'botocore.httpsession',
++        'URLLib3Session.send',
+         _xray_traced_pynamodb,
+     )
+ 
+@@ -59,7 +59,7 @@ def pynamodb_meta_processor(wrapped, instance, args, kwargs, return_value,
+         subsegment.add_error_flag()
+         subsegment.add_exception(exception, stack, True)
+ 
+-    resp = return_value.json() if return_value else None
++    resp = json.loads(return_value.text) if return_value else None
+     _extract_whitelisted_params(subsegment.name, operation_name, aws_meta,
+                                 [None, json.loads(args[0].body.decode('utf-8'))],
+                                 None, resp)