From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 06ED615815E for ; Fri, 2 Feb 2024 16:39:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 671992BC015; Fri, 2 Feb 2024 16:39:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44F89E2A3B for ; Fri, 2 Feb 2024 16:39:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 85EE83431FE for ; Fri, 2 Feb 2024 16:39:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 187E814CA for ; Fri, 2 Feb 2024 16:39:09 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1706891938.8e0a2a677cd74c1ff941b6c58e973b9d6cbfd759.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pylama/files/, dev-python/pylama/, profiles/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pylama/Manifest dev-python/pylama/files/pylama-8.4.1-dummy-elif.patch dev-python/pylama/files/pylama-8.4.1-tomli.patch dev-python/pylama/metadata.xml dev-python/pylama/pylama-8.4.1-r1.ebuild profiles/package.mask X-VCS-Directories: dev-python/pylama/files/ profiles/ dev-python/pylama/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8e0a2a677cd74c1ff941b6c58e973b9d6cbfd759 X-VCS-Branch: master Date: Fri, 2 Feb 2024 16:39:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 699bb9c8-a4ca-48bf-9d9f-3e1f2243d695 X-Archives-Hash: 2cd5fda4f63064a1d641892ae7d38a02 commit: 8e0a2a677cd74c1ff941b6c58e973b9d6cbfd759 Author: Michał Górny gentoo org> AuthorDate: Fri Feb 2 16:36:34 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Feb 2 16:38:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0a2a67 dev-python/pylama: Remove last-rited pkg Closes: https://bugs.gentoo.org/917008 Signed-off-by: Michał Górny gentoo.org> dev-python/pylama/Manifest | 1 - .../pylama/files/pylama-8.4.1-dummy-elif.patch | 32 ---------- dev-python/pylama/files/pylama-8.4.1-tomli.patch | 69 ---------------------- dev-python/pylama/metadata.xml | 17 ------ dev-python/pylama/pylama-8.4.1-r1.ebuild | 55 ----------------- profiles/package.mask | 1 - 6 files changed, 175 deletions(-) diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest deleted file mode 100644 index 893c44b456f9..000000000000 --- a/dev-python/pylama/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pylama-8.4.1.gh.tar.gz 37850 BLAKE2B dea99fc784736f3b229c5d82a59f2e2b5490fbe344ad98167e30e550b6c774c7b42cbddfedeb073d9d843cf53169c441812974036b06088ab07d7b7996def4a5 SHA512 fb038c39a2e962bd065ac5ef545f1be50f5b230141141a55e1701ffdc6a241b5778613ac91f29ff648b7ce48fa969c3961a11b7e906b6e350c84b57eea5369cd diff --git a/dev-python/pylama/files/pylama-8.4.1-dummy-elif.patch b/dev-python/pylama/files/pylama-8.4.1-dummy-elif.patch deleted file mode 100644 index 788d38382114..000000000000 --- a/dev-python/pylama/files/pylama-8.4.1-dummy-elif.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2093ce0ad405e20efa3f2dad771a04577e0f7e6b Mon Sep 17 00:00:00 2001 -From: Stanislav Levin -Date: Fri, 12 May 2023 19:38:41 +0300 -Subject: [PATCH] tests: Sync pylint's no-else-return - -https://github.com/klen/pylama/pull/243 - -See https://pylint.readthedocs.io/en/latest/user_guide/messages/refactor/no-else-return.html for details. - -Fixes: https://github.com/klen/pylama/issues/238 -Signed-off-by: Stanislav Levin ---- - dummy.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dummy.py b/dummy.py -index c19ee6d..09a0e3c 100644 ---- a/dummy.py -+++ b/dummy.py -@@ -22,10 +22,10 @@ def __init__(self, filename, loc, use_column=True): - if test == 1: - if test == 1: - return 28 -- elif test == 2: -+ if test == 2: - return 28 - return 28 -- elif test == 2: -+ if test == 2: - return 28 - - def __str__(self): diff --git a/dev-python/pylama/files/pylama-8.4.1-tomli.patch b/dev-python/pylama/files/pylama-8.4.1-tomli.patch deleted file mode 100644 index 291bc9f530e7..000000000000 --- a/dev-python/pylama/files/pylama-8.4.1-tomli.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 8b7908fec960a05af0a0a9b10d24ed458fcf97c7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Tue, 8 Nov 2022 14:33:59 +0100 -Subject: [PATCH] Use tomli/tomllib instead of the unmaintained toml package - -Replace the use of the unmaintained `toml` package with the modern -alternatives: the built-in `tomllib` in Python 3.11+, and its equivalent -`tomli` in older Python versions. `tomli` installs type stubs, so there -is no need for an additional `types-*` package for it. ---- - pylama/config_toml.py | 9 +++++++-- - requirements/requirements-tests.txt | 3 +-- - setup.py | 2 +- - 3 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/pylama/config_toml.py b/pylama/config_toml.py -index 2af02a5..ea6e17a 100644 ---- a/pylama/config_toml.py -+++ b/pylama/config_toml.py -@@ -1,16 +1,21 @@ - """Pylama TOML configuration.""" - --import toml -+import sys - - from pylama.libs.inirama import Namespace as _Namespace - -+if sys.version_info >= (3, 11): -+ import tomllib -+else: -+ import tomli as tomllib -+ - - class Namespace(_Namespace): - """Inirama-style wrapper for TOML config.""" - - def parse(self, source: str, update: bool = True, **params): - """Parse TOML source as string.""" -- content = toml.loads(source) -+ content = tomllib.loads(source) - tool = content.get("tool", {}) - pylama = tool.get("pylama", {}) - linters = pylama.pop("linter", {}) -diff --git a/requirements/requirements-tests.txt b/requirements/requirements-tests.txt -index d786f1f..e62ccae 100644 ---- a/requirements/requirements-tests.txt -+++ b/requirements/requirements-tests.txt -@@ -5,8 +5,7 @@ radon >= 5.1.0 - mypy - pylint >= 2.11.1 - pylama-quotes --toml -+tomli >= 1.2.3 ; python_version < "3.11" - vulture - - types-setuptools --types-toml -diff --git a/setup.py b/setup.py -index 911aea6..6d0222b 100644 ---- a/setup.py -+++ b/setup.py -@@ -21,6 +21,6 @@ def parse_requirements(path: str) -> "list[str]": - extras_require=dict( - tests=parse_requirements("requirements/requirements-tests.txt"), - all=OPTIONAL_LINTERS, **{linter: [linter] for linter in OPTIONAL_LINTERS}, -- toml="toml>=0.10.2", -+ toml="tomli>=1.2.3; python_version < '3.11'", - ), - ) diff --git a/dev-python/pylama/metadata.xml b/dev-python/pylama/metadata.xml deleted file mode 100644 index 5ea1c06f17d7..000000000000 --- a/dev-python/pylama/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - zmedico@gentoo.org - Zac Medico - - - python@gentoo.org - Python - - - - pylama - klen/pylama - - diff --git a/dev-python/pylama/pylama-8.4.1-r1.ebuild b/dev-python/pylama/pylama-8.4.1-r1.ebuild deleted file mode 100644 index 30c5ca59c22f..000000000000 --- a/dev-python/pylama/pylama-8.4.1-r1.ebuild +++ /dev/null @@ -1,55 +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_{9..11} ) - -inherit distutils-r1 - -DESCRIPTION="Code audit tool for python" -HOMEPAGE=" - https://github.com/klen/pylama/ - https://pypi.org/project/pylama/ -" -SRC_URI=" - https://github.com/klen/pylama/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - >=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}] - >=dev-python/pycodestyle-2.9.1[${PYTHON_USEDEP}] - >=dev-python/pydocstyle-6.1.1[${PYTHON_USEDEP}] - >=dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/eradicate[${PYTHON_USEDEP}] - dev-python/mypy[${PYTHON_USEDEP}] - dev-python/pylint[${PYTHON_USEDEP}] - dev-python/radon[${PYTHON_USEDEP}] - dev-vcs/git - $(python_gen_cond_dep ' - dev-python/tomli[${PYTHON_USEDEP}] - ' 3.{8..10}) - ) -" - -distutils_enable_tests pytest - -PATCHES=( - "${FILESDIR}"/${P}-tomli.patch - "${FILESDIR}"/${P}-dummy-elif.patch -) - -EPYTEST_DESELECT=( - # not packaged - tests/test_linters.py::test_quotes - tests/test_linters.py::test_vulture -) diff --git a/profiles/package.mask b/profiles/package.mask index 444387e980a4..406ade673cdf 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -201,7 +201,6 @@ media-sound/daudio # It has no reverse dependencies. # Removal on 2024-01-30. Bug #917008. dev-python/pydocstyle -dev-python/pylama # Andreas Sturmlechner (2023-12-25) # Masked until KF6 is unmasked.