diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-02-17 14:07:47 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-02-17 14:07:47 +0000 |
commit | 7c9730bcb62df7cbf8248c5db9a478aac52c60ea (patch) | |
tree | 3521ee333c83fb6c7ff14d0a0a2d742464e88767 /dev-python/pydocstyle | |
parent | 29394d0921808a94a409f01eff49f681651de5d5 (diff) |
gentoo auto-resync : 17:02:2023 - 14:07:46
Diffstat (limited to 'dev-python/pydocstyle')
-rw-r--r-- | dev-python/pydocstyle/Manifest | 3 | ||||
-rw-r--r-- | dev-python/pydocstyle/files/pydocstyle-6.1.1-tomli.patch | 90 | ||||
-rw-r--r-- | dev-python/pydocstyle/pydocstyle-6.1.1-r2.ebuild | 43 |
3 files changed, 0 insertions, 136 deletions
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest index cd139228149b..b3c3a7c7d616 100644 --- a/dev-python/pydocstyle/Manifest +++ b/dev-python/pydocstyle/Manifest @@ -1,9 +1,6 @@ AUX pydocstyle-6.1.1-disarm-pip-install.patch 1001 BLAKE2B d82d9b358cdd6b517cf64f5b620e767342ba6230ebda715e039be2b5bdbef639ad5d0e715f033658887bede3ee330da79f2a6ca3e1a597466f3bbffdd617d371 SHA512 434a576cad8fe6a2c8086893982887306ad6b4797c1ed0c3682782a3a9ec1109fc48d94ad469cd11128232d773d5beaef2cfc1c9a68c0386581e4864d43371fa -AUX pydocstyle-6.1.1-tomli.patch 2889 BLAKE2B 9e246941b41b19ee463f50e76075f3cdbc47ce48af6e6678e22826c5e184629a7fe6532540f7088174cebce4dfd97099e79eb9e106ef342af3814cf6d72a1755 SHA512 2e34de862def3f56e88e5feb0dfb1fc8f634f72c7796735c55d8830245a3dff1b95f5199d99299b87a680c8debaf5e7e1ced934a1bc07122d2faff1df54601ae -DIST pydocstyle-6.1.1.tar.gz 73982 BLAKE2B 6a896221fdcd257f0475472e1cf87ef892d8292a4c0faf661595adb17e2d18f4a8277cda498197309d34597c448203856c272256277a7e35fba20e2e5ba47f2b SHA512 ce4932a6601c80d05a46600f5af7df54798025a5f3dc41ab8cf1bc0d63e7f78b70cccb17dc99ddab25eda9abd639f91468fca1b1ceb4539708350212e481a156 DIST pydocstyle-6.2.3.gh.tar.gz 77612 BLAKE2B f94b9c8232a3e96dad1d84d37bf7cc53f114edfddbd0dad725ff3bb79f39576a5fceff5a2b962e284e9d0d96ac8d71e5aa0406322af4bf8fdc73910348ff9190 SHA512 b275bd2367a3a6d4636a2879f503da15b9965bffe2750db87cbd3ca09fc3353a481a9c38e1b35b3b2aeeba019e9dd393d2cb65db2820d6343fb4c9881f7e6deb DIST pydocstyle-6.3.0.gh.tar.gz 78058 BLAKE2B 551da9af8baebcba4f1053e0d9495bff039a98c96ad229219cd37ac8ba9e3002fff8a136c5148144a5f84ed94a1414364d7c827ad010038f63961ce17a260ee3 SHA512 f8473b19ab6ef0b61787875558f9dd6f9f7f1954e1baa0010942af6d4de8dbca30c8c08be6acbf24aadd1c0a601ba9467b747026a6cd22379f0c4b84a38b57c7 -EBUILD pydocstyle-6.1.1-r2.ebuild 989 BLAKE2B 0acd5c9f401b014438e19fd2d2059bc40464ef39ba10a43b45d681e3859f8db8a34d4b3d8e67d9d6ad5900fe3555e3d850f9e6c33485e0f0190986a1eb793824 SHA512 f2ebc6db099175342d8c9d83fdf54623a35598c17a4507923efe4dd4d7c3dc18e961a8e4e9bce7da0bc73f481cba062452ecd4a1b6fc5db08df19eaee28738a6 EBUILD pydocstyle-6.2.3.ebuild 1079 BLAKE2B 0ca1232e6a9bbc2013cfc1347048f82102e8de91c08928f2d2ef2a4019880b2c9ba686fa0c3f39b6d2a711e8cb8126d06280dc7602b592a92220a34bc84121fb SHA512 70f882a88360e2ae12111dfaa474f8286a075f188f2bad3e7009d2865082d57c42bcc2d89d18df57482854c8ce5fef833afddbb15866c1e02b176e6aeaee6721 EBUILD pydocstyle-6.3.0.ebuild 1079 BLAKE2B 0ca1232e6a9bbc2013cfc1347048f82102e8de91c08928f2d2ef2a4019880b2c9ba686fa0c3f39b6d2a711e8cb8126d06280dc7602b592a92220a34bc84121fb SHA512 70f882a88360e2ae12111dfaa474f8286a075f188f2bad3e7009d2865082d57c42bcc2d89d18df57482854c8ce5fef833afddbb15866c1e02b176e6aeaee6721 MISC metadata.xml 665 BLAKE2B ac358d1ac5d68d11710048ccd4050f45cee96788829ee806bc5f4364c0f6b03707dcf15dd0cb9e7e3870cd9feebcead3c44b8f6bbff6738aa593079685c2a3c0 SHA512 7642d1384de3ec4bd55f7afc69ce67ad018eb9294f104234c5f3eb23a2c7a5ab36bda890a440fb5a7af8045d215048caf4b15bb3d965f414b755b51a269337cc diff --git a/dev-python/pydocstyle/files/pydocstyle-6.1.1-tomli.patch b/dev-python/pydocstyle/files/pydocstyle-6.1.1-tomli.patch deleted file mode 100644 index 8be2adca5ba1..000000000000 --- a/dev-python/pydocstyle/files/pydocstyle-6.1.1-tomli.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 4c9ed77d3629a69febdaa14d153d3db869b58e4f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 12 Oct 2022 16:37:40 +0200 -Subject: [PATCH] Use tomllib/tomli for reading .toml configs - -Use the built-in `tomllib` module in Python 3.11 and the modern `tomli` -package in older Python versions to read .toml configs instead of -the unmaintained and broken `toml` package. - -Fixes #599 -Fixes #600 ---- - docs/release_notes.rst | 1 + - requirements/runtime.txt | 2 +- - requirements/tests.txt | 1 - - setup.py | 2 +- - src/pydocstyle/config.py | 20 ++++++++++++-------- - 5 files changed, 15 insertions(+), 11 deletions(-) - -diff --git a/requirements/runtime.txt b/requirements/runtime.txt -index 80302751..b4e9ca76 100644 ---- a/requirements/runtime.txt -+++ b/requirements/runtime.txt -@@ -1,2 +1,2 @@ - snowballstemmer==1.2.1 --toml==0.10.2 -+tomli==2.0.1; python_version < "3.11" -diff --git a/setup.py b/setup.py -index a9c5df1c..6c0671c7 100644 ---- a/setup.py -+++ b/setup.py -@@ -8,7 +8,7 @@ - 'snowballstemmer', - ] - extra_requirements = { -- 'toml': ['toml'], -+ 'toml': ['tomli; python_version < "3.11"'], - } - - -diff --git a/src/pydocstyle/config.py b/src/pydocstyle/config.py -index ed00c874..db7ed1b6 100644 ---- a/src/pydocstyle/config.py -+++ b/src/pydocstyle/config.py -@@ -4,6 +4,7 @@ - import itertools - import operator - import os -+import sys - from collections import namedtuple - from collections.abc import Set - from configparser import NoOptionError, NoSectionError, RawConfigParser -@@ -13,10 +14,13 @@ - from .utils import __version__, log - from .violations import ErrorRegistry, conventions - --try: -- import toml --except ImportError: # pragma: no cover -- toml = None # type: ignore -+if sys.version_info >= (3, 11): -+ import tomllib -+else: -+ try: -+ import tomli as tomllib -+ except ImportError: # pragma: no cover -+ tomllib = None # type: ignore - - - def check_initialized(method): -@@ -59,15 +63,15 @@ def read(self, filenames, encoding=None): - read_ok = [] - for filename in filenames: - try: -- with open(filename, encoding=encoding) as fp: -- if not toml: -+ with open(filename, "rb") as fp: -+ if not tomllib: - log.warning( - "The %s configuration file was ignored, " -- "because the `toml` package is not installed.", -+ "because the `tomli` package is not installed.", - filename, - ) - continue -- self._config.update(toml.load(fp)) -+ self._config.update(tomllib.load(fp)) - except OSError: - continue - if isinstance(filename, os.PathLike): diff --git a/dev-python/pydocstyle/pydocstyle-6.1.1-r2.ebuild b/dev-python/pydocstyle/pydocstyle-6.1.1-r2.ebuild deleted file mode 100644 index f3c4f96d22f6..000000000000 --- a/dev-python/pydocstyle/pydocstyle-6.1.1-r2.ebuild +++ /dev/null @@ -1,43 +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=( pypy3 python3_{9..11} ) - -inherit distutils-r1 - -DESCRIPTION="Python docstring style checker" -HOMEPAGE=" - https://github.com/PyCQA/pydocstyle/ - https://pypi.org/project/pydocstyle/ -" -SRC_URI=" - https://github.com/PyCQA/pydocstyle/archive/${PV}.tar.gz - -> ${P}.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" - -RDEPEND=" - dev-python/snowballstemmer[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - $(python_gen_cond_dep ' - dev-python/tomli[${PYTHON_USEDEP}] - ' 3.{8..10}) - ) -" - -distutils_enable_tests pytest -# Requires network to lookup github issues -#distutils_enable_sphinx docs dev-python/sphinx-rtd-theme dev-python/sphinxcontrib-issuetracker - -PATCHES=( - "${FILESDIR}"/pydocstyle-6.1.1-disarm-pip-install.patch - "${FILESDIR}"/${P}-tomli.patch -) |