diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2025-04-28 19:49:43 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2025-04-28 19:49:43 +0000 |
| commit | 16c4548c4ecfb76ab7155e8d40d386a4c4a0641c (patch) | |
| tree | 99a39e551f7419b6e639585db0809fda1bc1a6dd /dev-python | |
| parent | 83986b5bf92bd6945087363b99c52511f761fb70 (diff) | |
| download | baldeagleos-repo-16c4548c4ecfb76ab7155e8d40d386a4c4a0641c.tar.gz baldeagleos-repo-16c4548c4ecfb76ab7155e8d40d386a4c4a0641c.tar.xz baldeagleos-repo-16c4548c4ecfb76ab7155e8d40d386a4c4a0641c.zip | |
Adding metadata
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/langdetect/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch | 13 | ||||
| -rw-r--r-- | dev-python/langdetect/langdetect-1.0.9.ebuild | 4 | ||||
| -rw-r--r-- | dev-python/langdetect/metadata.xml | 10 | ||||
| -rw-r--r-- | dev-python/pip/files/pip-25.1-tomli-dep.patch | 76 | ||||
| -rw-r--r-- | dev-python/pip/pip-25.1-r1.ebuild (renamed from dev-python/pip/pip-25.1.ebuild) | 2 | ||||
| -rw-r--r-- | dev-python/pytest-bdd/files/pytest-bdd-8.1.0-gherkin-bounds.patch | 12 | ||||
| -rw-r--r-- | dev-python/pytest-bdd/pytest-bdd-8.1.0-r1.ebuild (renamed from dev-python/pytest-bdd/pytest-bdd-8.1.0.ebuild) | 6 |
8 files changed, 115 insertions, 10 deletions
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest index 37a64204a00a..a11d7c268c91 100644 --- a/dev-python/langdetect/Manifest +++ b/dev-python/langdetect/Manifest @@ -1,3 +1 @@ DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db -EBUILD langdetect-1.0.9.ebuild 494 BLAKE2B 9b3521c5721afa49a58e0c35267f7d82bb56bd7e1d6d3152be0d36cd220180a526cb20b90b1113fbf0fff4a512137570f0b3bcf864498b7b7cc00403cb61ca27 SHA512 16d311400bf84a5f04e15f3da4b68b2810e4b005009f4d03dc8a487176dfc294403c976c412c83dcfa8084a49ef7b7d5389b43fb2ba446ce107ce4595e3558c6 -MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45 diff --git a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch new file mode 100644 index 000000000000..637368d2f237 --- /dev/null +++ b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch @@ -0,0 +1,13 @@ +Fix "Package 'langdetect.profiles' is absent from the `packages` configuration." + +--- a/setup.py ++++ b/setup.py +@@ -18,7 +18,7 @@ setup( + author_email='michal.danilak@gmail.com', + url='https://github.com/Mimino666/langdetect', + keywords='language detection library', +- packages=['langdetect', 'langdetect.utils', 'langdetect.tests'], ++ packages=['langdetect', 'langdetect.utils', 'langdetect.tests', 'langdetect.profiles'], + include_package_data=True, + install_requires=['six'], + license='MIT', diff --git a/dev-python/langdetect/langdetect-1.0.9.ebuild b/dev-python/langdetect/langdetect-1.0.9.ebuild index 56733bbffc48..eb2586280d80 100644 --- a/dev-python/langdetect/langdetect-1.0.9.ebuild +++ b/dev-python/langdetect/langdetect-1.0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,4 +19,6 @@ KEYWORDS="~amd64" RDEPEND="dev-python/six[${PYTHON_USEDEP}]" +PATCHES=( "${FILESDIR}/${P}-explicit-config.patch" ) + distutils_enable_tests unittest diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml index 020e07f2a3dd..c0f74ac187e2 100644 --- a/dev-python/langdetect/metadata.xml +++ b/dev-python/langdetect/metadata.xml @@ -2,11 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>marcin.deranek@slonko.net</email> - <name>Marcin Deranek</name> + <email>pastalian46@gmail.com</email> + <name>Takuya Wakazono</name> </maintainer> - <upstream> - <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to> - </upstream> - <origin>slonko-overlay</origin> + + <origin>gentoo-guru-overlay</origin> </pkgmetadata>
\ No newline at end of file diff --git a/dev-python/pip/files/pip-25.1-tomli-dep.patch b/dev-python/pip/files/pip-25.1-tomli-dep.patch new file mode 100644 index 000000000000..780d9a84ad35 --- /dev/null +++ b/dev-python/pip/files/pip-25.1-tomli-dep.patch @@ -0,0 +1,76 @@ +From 23d20ea18ab4e43a4a4cb2b721d818a8dcd62542 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Mon, 28 Apr 2025 11:42:02 -0400 +Subject: [PATCH] Fix new dependency-groups feature to use the stdlib tomllib + where possible + +Previously, commit 88c9f31ad8a5ffe0bb31ab500b8ddd1b9ff6a5dd modified pip +to use the stdlib on versions of python where this module is in the +stdlib. As justified there: + +Although a tomli copy is vendored, doing this conditional import allows: +- automatically upgrading the code, when the time comes to drop py3.10 + support + +- slightly simplifying debundling support, as it's no longer necessary + to depend on a tomli(-wheel)? package on sufficiently newer versions + of python. + +https://github.com/pypa/pip/pull/13065 added a new feature, including a +vendored "dependency_groups" library that likewise supports using the +stdlib tomllib via `dependency_groups/_toml_compat.py`. But the code in +pip itself to use dependency_groups manually loads pyproject.toml and +passes it to dependency_groups, and fails to use the same compatibility +dispatch as both the pre-existing pip code and dependency_groups itself. + +Add back the conditional logic. +--- + news/13356.vendor.rst | 1 + + src/pip/_internal/req/req_dependency_group.py | 11 ++++++++--- + tests/unit/test_req_dependency_group.py | 2 +- + 3 files changed, 10 insertions(+), 4 deletions(-) + create mode 100644 news/13356.vendor.rst + +diff --git a/src/pip/_internal/req/req_dependency_group.py b/src/pip/_internal/req/req_dependency_group.py +index 8f124de5b81..e81dd45522a 100644 +--- a/src/pip/_internal/req/req_dependency_group.py ++++ b/src/pip/_internal/req/req_dependency_group.py +@@ -1,6 +1,11 @@ ++import sys + from typing import Any, Dict, Iterable, Iterator, List, Tuple + +-from pip._vendor import tomli ++if sys.version_info >= (3, 11): ++ import tomllib ++else: ++ from pip._vendor import tomli as tomllib ++ + from pip._vendor.dependency_groups import DependencyGroupResolver + + from pip._internal.exceptions import InstallationError +@@ -65,10 +70,10 @@ def _load_pyproject(path: str) -> Dict[str, Any]: + """ + try: + with open(path, "rb") as fp: +- return tomli.load(fp) ++ return tomllib.load(fp) + except FileNotFoundError: + raise InstallationError(f"{path} not found. Cannot resolve '--group' option.") +- except tomli.TOMLDecodeError as e: ++ except tomllib.TOMLDecodeError as e: + raise InstallationError(f"Error parsing {path}: {e}") from e + except OSError as e: + raise InstallationError(f"Error reading {path}: {e}") from e +diff --git a/tests/unit/test_req_dependency_group.py b/tests/unit/test_req_dependency_group.py +index b596f6fc5d7..1b180f8d7f8 100644 +--- a/tests/unit/test_req_dependency_group.py ++++ b/tests/unit/test_req_dependency_group.py +@@ -120,7 +120,7 @@ def epipe_toml_load(*args: Any, **kwargs: Any) -> None: + raise OSError(errno.EPIPE, "Broken pipe") + + monkeypatch.setattr( +- "pip._internal.req.req_dependency_group.tomli.load", epipe_toml_load ++ "pip._internal.req.req_dependency_group.tomllib.load", epipe_toml_load + ) + + with pytest.raises(InstallationError, match=r"Error reading pyproject\.toml"): diff --git a/dev-python/pip/pip-25.1.ebuild b/dev-python/pip/pip-25.1-r1.ebuild index f25c6e334a91..756297f3d0cd 100644 --- a/dev-python/pip/pip-25.1.ebuild +++ b/dev-python/pip/pip-25.1-r1.ebuild @@ -78,6 +78,8 @@ python_prepare_all() { "${FILESDIR}/pip-23.1-no-coverage.patch" # prepare to unbundle dependencies "${FILESDIR}/pip-25.0.1-unbundle.patch" + # https://github.com/pypa/pip/pull/13356 + "${FILESDIR}/${P}-tomli-dep.patch" ) distutils-r1_python_prepare_all diff --git a/dev-python/pytest-bdd/files/pytest-bdd-8.1.0-gherkin-bounds.patch b/dev-python/pytest-bdd/files/pytest-bdd-8.1.0-gherkin-bounds.patch new file mode 100644 index 000000000000..0a1087211c96 --- /dev/null +++ b/dev-python/pytest-bdd/files/pytest-bdd-8.1.0-gherkin-bounds.patch @@ -0,0 +1,12 @@ +Unknown how long until next release, and meanwhile `pip check` +reporting errors has a tendency to break random things. + +Backport from: +https://github.com/pytest-dev/pytest-bdd/commit/8ce79eafa6ac4 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -43,3 +43,3 @@ + packaging = "*" +-gherkin-official = "^29.0.0" ++gherkin-official = ">=29.0.0" + diff --git a/dev-python/pytest-bdd/pytest-bdd-8.1.0.ebuild b/dev-python/pytest-bdd/pytest-bdd-8.1.0-r1.ebuild index 9bc4cce287df..2a224522af39 100644 --- a/dev-python/pytest-bdd/pytest-bdd-8.1.0.ebuild +++ b/dev-python/pytest-bdd/pytest-bdd-8.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2024 Gentoo Authors +# Copyright 2021-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -32,6 +32,10 @@ distutils_enable_tests pytest DOCS=( AUTHORS.rst CHANGES.rst README.rst ) +PATCHES=( + "${FILESDIR}"/${P}-gherkin-bounds.patch +) + src_test() { # terminal_reporter test needs exact wrapping local -x COLUMNS=80 |
