Skip to content

Commit c2d48a9

Browse files
onkelbehonkelbeh
committed
dev-python/pipdeptree: re-add 2.13.2 from main
dev-python/pytest-asyncio: re-add 0.23.4-r1 from main Signed-off-by: Andreas Billmeier <[email protected]>
1 parent d6a01ae commit c2d48a9

8 files changed

+220
-3
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -617,12 +617,12 @@ A daily compile test is run at Github with Python 3.9 to catch general faults. E
617617

618618
## Licenses
619619
This repository itself is released under GPL-3 (like most Gentoo repositories), all work on the depending components under the licenses they came from. Perhaps you came here because I filed an issue at your component about a bad or missing license. It is easy to [assign a license](https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository). During cleanups and license investigations I have been asked often which license to choose. I am not a lawyer, but I can offer the following table, counted over this repository, perhaps this helps your decision. If a package has more than one license listed, all of them are counted.
620-
There are 1822 Ebuilds in total, 1811 of them have in total 1830 (42 different) licenses assigned.
620+
There are 1824 Ebuilds in total, 1813 of them have in total 1832 (42 different) licenses assigned.
621621

622622
|License| Ebuilds using it|
623623
|-------|-----|
624-
|MIT|1034|
625-
|Apache-2.0|409|
624+
|MIT|1035|
625+
|Apache-2.0|410|
626626
|GPL-3|120|
627627
|BSD|103|
628628
|LGPL-3|24|

‎dev-python/pipdeptree/Manifest

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
AUX pipdeptree-2.13.1-expect-hpy-in-pypy-7.3.3.patch 1018 BLAKE2B 18405bf1f1ba5a457c9643738258df5d1c3d5ed709954dd274560ae9cbf139f336b75b2c896d9d8bdfe24c4d2cb98ea3e0391d73ac05ba1e38766f2cfa04a431 SHA512 da732fe18cc3f49ed3994133e8a5eefe4c6f8ebf18dad3caeb057bcdbab38f5936c245271d6ff534f3cb6069255e13291a9033594148e70e486fd85d5b9e711e
2+
AUX pipdeptree-2.13.2-fix-pypy-7.3.14.patch 1353 BLAKE2B 5e3a6f53244de1ae185818e3e2a37a87229b46b02c390a606b65668ae1dc53fe1a6b5e6c9faaf6160f25adc7e2597cceb5fd89bb20414a609880e034c7bdc026 SHA512 e0e8e729d713d347c96ee7db5e6a14ba7a9a986aa41231731973b4ab31f8d866cd4d229b35b54411e171a446d61201675ab3df01a58079786eabf5a080de05ad
13
DIST pipdeptree-2.11.0.tar.gz 32264 BLAKE2B e035e2370a382288b8ce8848ccad62536a41c83b06920ca9b5df331c057a92f8be48a5763c1d5abcc0a58133b4c2db1311db2adf426bb949da7d725306c0ac39 SHA512 661341b02ab388ac494a2f65cf621e188ec5284aedd66c184d2f6ca17277da728e4f86a9f1758120bd9a575b2c305d1475646bdc858371b9265a09c22455e897
4+
DIST pipdeptree-2.13.2.tar.gz 33290 BLAKE2B 1b97dbfaa6f6baff272e6e6d5399f95b96e13b19bba5ef3997574d027002abd98152e26d67b4b19555392d076c84bf6b142d147d95349ba1dd535bea40994b4f SHA512 ce6cfc29827c087725366a95079621516303cf50c6c4ee4a0cd5d8b7649e8dd7b7145b62523c48731a2b5f4140c90c558eb5d1a0248b28a8c4c97ccb78d9e16d
25
EBUILD pipdeptree-2.11.0.ebuild 610 BLAKE2B d5ddf29ad5a85f1a865c20ea91bcc070eaac06331f716cb94feefaadc828a6976fa44824293b6ce9ee597377c8c4ec765a815c7b15c5d2231a2a293745d5f875 SHA512 695a47c464a0131e2d76615c88301128ac818e4de4cd61c2e2af49e48e5b61ec2938235bf484ba745618409de128c89b6962f45638be3cf7afd56ca2e799dd3d
6+
EBUILD pipdeptree-2.13.2.ebuild 1001 BLAKE2B 353933b6854bcd9f62299cc3932e5256028cacf9dc5a62c6cbfb546524b4553c8c860c3f43fc9f819dbc89c0ed0a82d63762b6624d8388aace92fd79563e6ff2 SHA512 0c497bfee60c2ae4aa8d11d347190d180630e2753c20f8d8f93546de184fa165738dd7fb52554ca09d0d7a9c70bca060529ef943cf91f07483827749d335ca88
37
MISC metadata.xml 519 BLAKE2B b2fa8cd6122ddf32893b33aa574bca14b8909eee2e1ee04d2ac9e059eee36012988f2a8d150776a2e39e37ac7831bf7203e73263485059dfdc846215d6cace7a SHA512 fb7f3a441e2fd2aa1f6d08815b53ab2d7cb0b5a8e4d447a7f80d1973d9012a180cb9f6b0513853b26919dba563314a132a0e9300ed9df0ff445bb0904b2772be

‎dev-python/pipdeptree/files/pipdeptree-2.13.1-expect-hpy-in-pypy-7.3.3.patch

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
https://github.com/tox-dev/pipdeptree/pull/302
2+
3+
From 8a2ccfe062d8978f010e2e4bd3f8e8b9e46ecbce Mon Sep 17 00:00:00 2001
4+
From: Alfred Wingate <[email protected]>
5+
Date: Tue, 14 Nov 2023 08:36:09 +0200
6+
Subject: [PATCH] Expect hpy in pypy versions >= 7.3.3
7+
8+
Signed-off-by: Alfred Wingate <[email protected]>
9+
--- a/tests/test_non_host.py
10+
+++ b/tests/test_non_host.py
11+
@@ -33,7 +33,11 @@ def test_custom_interpreter(
12+
if implementation == "CPython":
13+
expected = {"pip", "setuptools", "wheel"}
14+
elif implementation == "PyPy":
15+
- expected = {"cffi", "greenlet", "pip", "readline", "setuptools", "wheel"}
16+
+ # hpy added in 7.3.2, enabled in 7.3.3
17+
+ if sys.pypy_version_info >= (7, 3, 3):
18+
+ expected = {"cffi", "greenlet", "hpy", "pip", "readline", "setuptools", "wheel"}
19+
+ else:
20+
+ expected = {"cffi", "greenlet", "pip", "readline", "setuptools", "wheel"}
21+
else:
22+
raise ValueError(implementation)
23+
if sys.version_info >= (3, 12):
24+
--
25+
2.42.1
26+

‎dev-python/pipdeptree/files/pipdeptree-2.13.2-fix-pypy-7.3.14.patch

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
https://bugs.gentoo.org/923893
2+
3+
From 5d111ebe3bb1d24baa314b615d67d3e3928297ca Mon Sep 17 00:00:00 2001
4+
From: Alfred Wingate <[email protected]>
5+
Date: Wed, 7 Feb 2024 08:47:03 +0200
6+
Subject: [PATCH] Use json output for test which parses installed packages
7+
8+
* pypy bundles hpy which has a dependency on setuptools, therefore
9+
breaking non-json output due sub-dependency pretty printing.
10+
* Using json makes parsing dependencies straight forward.
11+
12+
Signed-off-by: Alfred Wingate <[email protected]>
13+
--- a/tests/test_non_host.py
14+
+++ b/tests/test_non_host.py
15+
@@ -1,5 +1,6 @@
16+
from __future__ import annotations
17+
18+
+import json
19+
import sys
20+
from platform import python_implementation
21+
from typing import TYPE_CHECKING
22+
@@ -25,10 +26,10 @@ def test_custom_interpreter(
23+
monkeypatch.chdir(tmp_path)
24+
py = str(result.creator.exe.relative_to(tmp_path))
25+
cmd += [f"--python={result.creator.exe}"] if args_joined else ["--python", py]
26+
- monkeypatch.setattr(sys, "argv", cmd)
27+
+ monkeypatch.setattr(sys, "argv", [*cmd, "-j"])
28+
main()
29+
out, _ = capfd.readouterr()
30+
- found = {i.split("==")[0] for i in out.splitlines()}
31+
+ found = {i["package"]["package_name"] for i in json.loads(out)}
32+
implementation = python_implementation()
33+
if implementation == "CPython":
34+
expected = {"pip", "setuptools", "wheel"}
35+
--
36+
2.43.0
37+

‎dev-python/pipdeptree/pipdeptree-2.13.2.ebuild

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Copyright 2022-2024 Gentoo Authors
2+
# Distributed under the terms of the GNU General Public License v2
3+
4+
EAPI=8
5+
6+
DISTUTILS_USE_PEP517=hatchling
7+
PYTHON_COMPAT=( pypy3 python3_{10..12} )
8+
9+
inherit distutils-r1 pypi optfeature
10+
11+
DESCRIPTION="Utility for displaying installed packages in a dependency tree"
12+
HOMEPAGE="
13+
https://github.com/tox-dev/pipdeptree/
14+
https://pypi.org/project/pipdeptree/
15+
"
16+
17+
LICENSE="MIT"
18+
SLOT="0"
19+
KEYWORDS="~amd64 ~arm64 ~riscv"
20+
21+
BDEPEND="
22+
dev-python/hatch-vcs[${PYTHON_USEDEP}]
23+
test? (
24+
dev-python/graphviz[${PYTHON_USEDEP}]
25+
dev-python/pip[${PYTHON_USEDEP}]
26+
dev-python/pytest-mock[${PYTHON_USEDEP}]
27+
dev-python/virtualenv[${PYTHON_USEDEP}]
28+
)
29+
"
30+
31+
PATCHES=(
32+
# https://github.com/tox-dev/pipdeptree/pull/302
33+
"${FILESDIR}/pipdeptree-2.13.1-expect-hpy-in-pypy-7.3.3.patch"
34+
"${FILESDIR}/pipdeptree-2.13.2-fix-pypy-7.3.14.patch"
35+
)
36+
37+
distutils_enable_tests pytest
38+
39+
pkg_postinst() {
40+
optfeature \
41+
"visualising the dependency graph with --graph-output" \
42+
dev-python/graphviz
43+
}

‎dev-python/pytest-asyncio/Manifest

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
AUX pytest-asyncio-0.23.4-pytest-8.patch 1736 BLAKE2B 8f603b2a2c468f1f85c92842f0b47ca8ade9e6e45bfb9b417da61410604faf209e468e9a716a56bf714bab9d5b14aef822db300a27168f65c35dda1844d43a71 SHA512 badde4aaf63f995ff38fc2ef6804fd0b5cfdc5ce7fbd5e2e3f28048c1e64dacf1d1929cac0d15ec801e74ad49e634540209c9baa8c09f2a5e19e4016ff8142f0
12
DIST pytest-asyncio-0.14.0.gh.tar.gz 14796 BLAKE2B 0a110dabde491293dc10452239971809ec6a4006a2036e848aac067df1af328d0d1d5c7afae8cfc1ecf5c919c0922050e2db182065500ec614a8094d3799c0cd SHA512 d1fadff152a0c94f80a8272a0dd293bd9d9300ad9e79c69556b5901c1a8ce00545f7715e503a383e3f4f35c8090d8f9ec33d16739b85378b59b1786a50441fca
23
DIST pytest-asyncio-0.21.0.gh.tar.gz 28675 BLAKE2B d3b4121a6849c9c508dfe59b0ee0adb4d20a3365ebcd6df51db50c576e716634c0d3a8ae5932ac2f36085795b10cd47d2ff61f90a22645d199aa2debebc22b23 SHA512 d678d8957e091753684841fff668284d591587d3190db514afd3713b9fe94826b27d1b455b7ac4447a67587203d5caabf8611e199cbb9792e5171072fe55d823
4+
DIST pytest-asyncio-0.23.4.tar.gz 45162 BLAKE2B 69092bff908beb2b707d281142145edf0508bcb09aa59e4a91d18b3cdb24e5533436a9668e2d243425b4914f2913e6186fa6d8b6c1d187b6bf25191986d27981 SHA512 831c572ae981b8575f97dd4d0d40d960d49cbeeb6b186e1c094eb45b1f48210824780ca14cbf44d1da558b1a17ca1fefc0eda26137461172bbd12f8b25ab8ebb
35
EBUILD pytest-asyncio-0.14.0.ebuild 1184 BLAKE2B 3757755033a717ca128a9e9a1add92172f03ec7b1558374305708760a81d39e8405d25435d9d5ec80c1c46d08e217b8633fb5fe788f116784ebc8c1e6c12d41d SHA512 a0073d3e834cdd3cd802d6ec91e302782ddc58d88ad486d656739b8069fa0a368f517c83df416440509fe9c63eedee821b607e19bee03b796077405c59c1073f
46
EBUILD pytest-asyncio-0.21.0.ebuild 1184 BLAKE2B cb6a9d93e23ba40d705b48b2eae35426441196855ecd7b1e413fed462c29120dadb2479fa12b5222d4d8c3900eda951989655f043c4953f232a5823c8b244fb4 SHA512 c18ef45583eae321bfce97427b1208292ff5b398383014e3e4901e960322a76449c595dfaca8858e3030e6fc94f913a9c57b3e9c3249d7aa8fb6ab5302a8524d
7+
EBUILD pytest-asyncio-0.23.4-r1.ebuild 1718 BLAKE2B cc45a5663ffdc9ca3d49e1e4517e633730810e2818ba78f026312df663222f296aebe2139fac5cf14666a51c14e91b28340a9a8de6d8a16eb1f94b72a5e53b19 SHA512 22a19f0259fd253a1dced23f1f49e6a38f54d3c433ee2e8618b4d542aab7923610b638803c8fdc792f79399607c8b3d7274ad32f7427ac35383031e28ec087a3
58
MISC metadata.xml 557 BLAKE2B 28bdae11b19189ed1998ddcfe1ed9dab56722ae774f297fb7981e2deb916f5485747932fd551549e51234bf56000b309af202601aa4fa3559879e3bc4592c3b7 SHA512 776726a9bcd868bc58f48af506c5483c2fb137713178c9be6d131285d430928691157537fc0347572868dca223a0f4b84ead9742d2d17b932642ed1b3d8c0366

‎dev-python/pytest-asyncio/files/pytest-asyncio-0.23.4-pytest-8.patch

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
From d53c12962fd7250bea28e03b5a141be73cfce06b Mon Sep 17 00:00:00 2001
2+
From: Arjan Keeman <[email protected]>
3+
Date: Tue, 6 Feb 2024 14:46:13 +0100
4+
Subject: [PATCH] fix compatibility with pytest ^8
5+
6+
diff --git a/setup.cfg b/setup.cfg
7+
index 45d70b3..e8cbfc5 100644
8+
--- a/setup.cfg
9+
+++ b/setup.cfg
10+
@@ -40,5 +40,5 @@ include_package_data = True
11+
install_requires =
12+
- pytest >= 7.0.0,<8
13+
+ pytest >= 7.0.0, !=8.0.0rc1, !=8.0.0rc2
14+
15+
[options.extras_require]
16+
testing =
17+
diff --git a/tests/markers/test_session_scope.py b/tests/markers/test_session_scope.py
18+
index bd0baee..9049c17 100644
19+
--- a/tests/markers/test_session_scope.py
20+
+++ b/tests/markers/test_session_scope.py
21+
@@ -44,7 +44,9 @@ def test_asyncio_mark_provides_session_scoped_loop_strict_mode(pytester: Pyteste
22+
"""
23+
),
24+
)
25+
- subpackage_name = "subpkg"
26+
+
27+
+ # subpackage_name must alphabetically come after test_module_one.py
28+
+ subpackage_name = "z_subpkg"
29+
subpkg = pytester.mkpydir(subpackage_name)
30+
subpkg.joinpath("test_subpkg.py").write_text(
31+
dedent(
32+
diff --git a/tests/test_is_async_test.py b/tests/test_is_async_test.py
33+
index 512243b..12e791c 100644
34+
--- a/tests/test_is_async_test.py
35+
+++ b/tests/test_is_async_test.py
36+
@@ -77,8 +77,10 @@ def test_returns_false_for_unmarked_coroutine_item_in_strict_mode(pytester: Pyte
37+
if pytest.version_tuple < (7, 2):
38+
# Probably related to https://github.com/pytest-dev/pytest/pull/10012
39+
result.assert_outcomes(failed=1)
40+
- else:
41+
+ elif pytest.version_tuple < (8,):
42+
result.assert_outcomes(skipped=1)
43+
+ else:
44+
+ result.assert_outcomes(failed=1)
45+
46+
47+
def test_returns_true_for_unmarked_coroutine_item_in_auto_mode(pytester: Pytester):

‎dev-python/pytest-asyncio/pytest-asyncio-0.23.4-r1.ebuild

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Copyright 2019-2024 Gentoo Authors
2+
# Distributed under the terms of the GNU General Public License v2
3+
4+
EAPI=8
5+
6+
DISTUTILS_USE_PEP517=setuptools
7+
PYPI_NO_NORMALIZE=1
8+
PYTHON_COMPAT=( python3_{10..12} pypy3 )
9+
10+
inherit distutils-r1 pypi
11+
12+
DESCRIPTION="Library for testing asyncio code with pytest"
13+
HOMEPAGE="
14+
https://github.com/pytest-dev/pytest-asyncio/
15+
https://pypi.org/project/pytest-asyncio/
16+
"
17+
18+
LICENSE="Apache-2.0"
19+
SLOT="0"
20+
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
21+
22+
RDEPEND="
23+
>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]
24+
"
25+
BDEPEND="
26+
dev-python/setuptools-scm[${PYTHON_USEDEP}]
27+
test? (
28+
>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
29+
)
30+
"
31+
32+
distutils_enable_tests pytest
33+
34+
PATCHES=(
35+
# https://github.com/pytest-dev/pytest-asyncio/pull/776
36+
"${FILESDIR}/${P}-pytest-8.patch"
37+
)
38+
39+
python_test() {
40+
local EPYTEST_DESELECT=(
41+
# rely on precise warning counts
42+
tests/hypothesis/test_base.py::test_can_use_explicit_event_loop_fixture
43+
tests/modes/test_legacy_mode.py
44+
tests/modes/test_strict_mode.py::test_strict_mode_ignores_unmarked_fixture
45+
tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_fixture_leaves_loop_unclosed
46+
tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_test_leaves_loop_unclosed
47+
tests/test_pytest_min_version_warning.py
48+
tests/trio/test_fixtures.py::test_strict_mode_ignores_trio_fixtures
49+
50+
# TODO
51+
tests/test_is_async_test.py::test_returns_false_for_unmarked_coroutine_item_in_strict_mode
52+
)
53+
54+
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
55+
local -x PYTEST_PLUGINS=pytest_asyncio.plugin,_hypothesis_pytestplugin
56+
epytest
57+
}

0 commit comments

Comments
 (0)