* [gentoo-commits] repo/gentoo:master commit in: dev-python/aws-xray-sdk-python/, dev-python/aws-xray-sdk-python/files/
@ 2021-09-19 17:08 Arthur Zamarin
0 siblings, 0 replies; 2+ messages in thread
From: Arthur Zamarin @ 2021-09-19 17:08 UTC (permalink / raw
To: gentoo-commits
commit: 429ee757d193dc71ac56b63577f0892eac3fe466
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 19 17:08:04 2021 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 19 17:08:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=429ee757
dev-python/aws-xray-sdk-python: enable py3.10
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.../aws-xray-sdk-python-2.8.0.ebuild | 40 ++++++++++------------
...ws-xray-sdk-python-2.8.0-fix-py3.10-loops.patch | 36 +++++++++++++++++++
2 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild
index 560c3e416da..d07a31c0dce 100644
--- a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild
+++ b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
@@ -15,7 +16,6 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
RDEPEND="
>=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
@@ -33,6 +33,10 @@ BDEPEND="
dev-python/webtest[${PYTHON_USEDEP}]
)"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-py3.10-loops.patch"
+)
+
distutils_enable_tests pytest
python_test() {
@@ -40,34 +44,28 @@ python_test() {
local -x AWS_SECRET_ACCESS_KEY=fake_key
local -x AWS_ACCESS_KEY_ID=fake_id
- local args=(
- # unpackaged deps
- --ignore tests/ext/aiobotocore
- --ignore tests/ext/pg8000
- --ignore tests/ext/psycopg2
- --ignore tests/ext/pymysql
- --ignore tests/ext/pynamodb
- --ignore tests/ext/sqlalchemy_core/test_postgres.py
- --deselect tests/ext/django/test_db.py
-
+ local EPYTEST_DESELECT=(
# Internet access
- --deselect
tests/test_patcher.py::test_external_file
- --deselect
tests/test_patcher.py::test_external_module
- --deselect
tests/test_patcher.py::test_external_submodules_full
- --deselect
tests/test_patcher.py::test_external_submodules_ignores_file
- --deselect
tests/test_patcher.py::test_external_submodules_ignores_module
- --deselect
tests/ext/aiohttp/test_client.py
- --ignore
+ )
+ local EPYTEST_IGNORE=(
+ # unpackaged deps
+ tests/ext/aiobotocore
+ tests/ext/pg8000
+ tests/ext/psycopg2
+ tests/ext/pymysql
+ tests/ext/pynamodb
+ tests/ext/sqlalchemy_core/test_postgres.py
+ tests/ext/django/test_db.py
+ # Internet access
tests/ext/httplib
- --ignore
tests/ext/requests
)
- epytest -p no:django "${args[@]}"
+ epytest -p no:django
}
diff --git a/dev-python/aws-xray-sdk-python/files/aws-xray-sdk-python-2.8.0-fix-py3.10-loops.patch b/dev-python/aws-xray-sdk-python/files/aws-xray-sdk-python-2.8.0-fix-py3.10-loops.patch
new file mode 100644
index 00000000000..cde91a8d0cd
--- /dev/null
+++ b/dev-python/aws-xray-sdk-python/files/aws-xray-sdk-python-2.8.0-fix-py3.10-loops.patch
@@ -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]]
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/aws-xray-sdk-python/, dev-python/aws-xray-sdk-python/files/
@ 2023-05-05 13:43 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2023-05-05 13:43 UTC (permalink / raw
To: gentoo-commits
commit: 24bd20a4fa0e3aba00bae498cdb148141dd5ca90
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri May 5 13:37:35 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 5 13:43:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24bd20a4
dev-python/aws-xray-sdk-python: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/aws-xray-sdk-python/Manifest | 1 -
.../aws-xray-sdk-python-2.11.0-r1.ebuild | 85 ----------------------
...ws-xray-sdk-python-2.8.0-fix-py3.10-loops.patch | 36 ---------
3 files changed, 122 deletions(-)
diff --git a/dev-python/aws-xray-sdk-python/Manifest b/dev-python/aws-xray-sdk-python/Manifest
index ae7bae43d8f9..18e6c1166254 100644
--- a/dev-python/aws-xray-sdk-python/Manifest
+++ b/dev-python/aws-xray-sdk-python/Manifest
@@ -1,2 +1 @@
-DIST aws-xray-sdk-python-2.11.0.gh.tar.gz 275430 BLAKE2B 1c1d3b56629dbd822b4f9fcb1e7ba5b43fbbff55fbe7ac02d75e0bb50629c4a0e5baed2b4c14c4c8a7775d60da5b285f96bca68b68b64ddf03aeec0c6094c74c SHA512 62035db955ce3d60e6d75088b7255dec83b21b4fd02353146b34bc48bdacff805b711b5caaca7adbbb5c5a3632a97910907d04681f36c198c99fbb4ef1cc4f85
DIST aws-xray-sdk-python-2.12.0.gh.tar.gz 275773 BLAKE2B a78ac201524e70a342100c2e76e93bb02ed76e183dfca2e8737230061182d94c9a7f4eba183bc731d2ed79a8e4dda486ea09cb304f4cd58da56d712b8e6c5749 SHA512 0616369f95bf0de710ab5fb868d1a84280bcc1180cc205e6a6e0c405eae131fb861de75fea00c9c1be4e163b9d292cc27e08f624c7b6981ba4a3b8d99dbbb63c
diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.11.0-r1.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.11.0-r1.ebuild
deleted file mode 100644
index 4b7da39f41f4..000000000000
--- a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.11.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="AWS X-Ray SDK for Python"
-HOMEPAGE="
- https://github.com/aws/aws-xray-sdk-python/
- https://pypi.org/project/aws-xray-sdk/
-"
-SRC_URI="
- https://github.com/aws/aws-xray-sdk-python/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- >=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
- dev-python/wrapt[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/bottle[${PYTHON_USEDEP}]
- <dev-python/flask-sqlalchemy-3[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
- dev-python/webtest[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.8.0-fix-py3.10-loops.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
- local -x DJANGO_SETTINGS_MODULE=tests.ext.django.app.settings
- local -x AWS_SECRET_ACCESS_KEY=fake_key
- local -x AWS_ACCESS_KEY_ID=fake_id
-
- local EPYTEST_DESELECT=(
- # Internet access
- tests/test_patcher.py::test_external_file
- tests/test_patcher.py::test_external_module
- tests/test_patcher.py::test_external_submodules_full
- tests/test_patcher.py::test_external_submodules_ignores_file
- tests/test_patcher.py::test_external_submodules_ignores_module
- # benchmark
- tests/test_local_sampling_benchmark.py
- # Fails, probably because above is ignored
- tests/test_async_local_storage.py::test_localstorage_isolation
- tests/test_async_recorder.py::test_capture
- tests/test_async_recorder.py::test_concurrent_calls
- tests/test_async_recorder.py::test_async_context_managers
- )
- local EPYTEST_IGNORE=(
- # unpackaged deps
- tests/ext/aiobotocore
- tests/ext/pg8000
- tests/ext/psycopg2
- tests/ext/pymysql
- tests/ext/pynamodb
- tests/ext/sqlalchemy_core/test_postgres.py
- tests/ext/django/test_db.py
- # Internet access
- tests/ext/httplib
- tests/ext/httpx
- tests/ext/requests
- # requires old package vesions
- tests/ext/django
- tests/ext/aiohttp
- )
-
- epytest -p no:django
-}
diff --git a/dev-python/aws-xray-sdk-python/files/aws-xray-sdk-python-2.8.0-fix-py3.10-loops.patch b/dev-python/aws-xray-sdk-python/files/aws-xray-sdk-python-2.8.0-fix-py3.10-loops.patch
deleted file mode 100644
index cde91a8d0cda..000000000000
--- a/dev-python/aws-xray-sdk-python/files/aws-xray-sdk-python-2.8.0-fix-py3.10-loops.patch
+++ /dev/null
@@ -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]]
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-05 13:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-19 17:08 [gentoo-commits] repo/gentoo:master commit in: dev-python/aws-xray-sdk-python/, dev-python/aws-xray-sdk-python/files/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2023-05-05 13:43 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox