commit: 2ea9123dcf34b9a6fd0a70b31360408b38fd402a Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Sat Feb 10 12:08:25 2024 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Sat Feb 10 12:08:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea9123d
dev-python/pytest-shutil: treeclean Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> dev-python/pytest-shutil/Manifest | 1 - .../files/pytest-shutil-1.7.0-py312.patch | 39 ---------------- dev-python/pytest-shutil/metadata.xml | 22 --------- .../pytest-shutil/pytest-shutil-1.7.0-r4.ebuild | 54 ---------------------- profiles/package.mask | 1 - 5 files changed, 117 deletions(-) diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest deleted file mode 100644 index f72bfbdf3cc0..000000000000 --- a/dev-python/pytest-shutil/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pytest-shutil-1.7.0.tar.gz 23497 BLAKE2B e13641491fb4bd448973b8004ac9ded2f9b7c412ea93af7f9206e5fc38ea7554073374116eeefc529d2ae35e8a25e678fef5a27089af89026077a72d11d6016d SHA512 3746c08b17834621a7142ed9d5915b5c348c13367f5b423b258d3471bcb9c9e983c61c25ca936f879b8b82f80512512b7f3ade5555c24a790c72b502e3f3d144 diff --git a/dev-python/pytest-shutil/files/pytest-shutil-1.7.0-py312.patch b/dev-python/pytest-shutil/files/pytest-shutil-1.7.0-py312.patch deleted file mode 100644 index 905550622fc1..000000000000 --- a/dev-python/pytest-shutil/files/pytest-shutil-1.7.0-py312.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bbb9e5c7cba84fb4665a521569d1cfcca08ee4e5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org> -Date: Sat, 27 May 2023 18:05:44 +0200 -Subject: [PATCH] pytest-shutil: Replace deprecated imp module - -Replace the use of the deprecated `imp` module with `importlib.util', -as the former has been removed from Python 3.12. ---- - pytest-shutil/pytest_shutil/run.py | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/pytest-shutil/pytest_shutil/run.py b/pytest-shutil/pytest_shutil/run.py -index 7d46aea..08a6a34 100644 ---- a/pytest_shutil/run.py -+++ b/pytest_shutil/run.py -@@ -3,7 +3,7 @@ - """ - import sys - import os --import imp -+import importlib.util - import logging - from functools import update_wrapper - import inspect -@@ -112,7 +112,10 @@ def run_module_as_main(module, argv=[]): - filename = os.path.splitext(filename)[0] + ".py" - - with patch("sys.argv", new=argv): -- imp.load_source('__main__', os.path.join(where, filename)) -+ spec = importlib.util.spec_from_file_location( -+ "__main__", os.path.join(where, filename)) -+ module = importlib.util.module_from_spec(spec) -+ spec.loader.exec_module(module) - - - def _evaluate_fn_source(src, *args, **kwargs): --- -2.40.1 - diff --git a/dev-python/pytest-shutil/metadata.xml b/dev-python/pytest-shutil/metadata.xml deleted file mode 100644 index 9be6b49714b1..000000000000 --- a/dev-python/pytest-shutil/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>pyt...@gentoo.org</email> - <name>Python</name> - </maintainer> - <stabilize-allarches/> - <upstream> - <maintainer> - <email>eeas...@gmail.com</email> - <name>Edward Easton</name> - </maintainer> - <remote-id type="pypi">pytest-shutil</remote-id> - <remote-id type="github">man-group/pytest-plugins</remote-id> - </upstream> - <longdescription> - This library is a goodie-bag of Unix shell and environment management - tools for automated tests. A summary of the available functions is - below, look at the source for the full listing. - </longdescription> -</pkgmetadata> diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r4.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r4.ebuild deleted file mode 100644 index 652875bbb6c6..000000000000 --- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r4.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{10..12} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test" -HOMEPAGE=" - https://github.com/man-group/pytest-plugins/ - https://pypi.org/project/pytest-shutil/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" - -RDEPEND=" - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/execnet[${PYTHON_USEDEP}] - dev-python/path[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/termcolor[${PYTHON_USEDEP}] -" -BDEPEND=" - ${RDEPEND} - dev-python/setuptools-git[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -PATCHES=( - # https://github.com/man-group/pytest-plugins/pull/219 - "${FILESDIR}"/${P}-py312.patch -) - -EPYTEST_DESELECT=( - # colors no longer happen automagically to non-tty, not important - # https://github.com/man-group/pytest-plugins/pull/217 - tests/unit/test_cmdline.py::test_pretty_formatter -) - -python_prepare_all() { - # remove unnecessary deps - # (contextlib2 is not used in py3) - sed -i -e '/path\.py/d' -e '/contextlib2/d' setup.py || die - - distutils-r1_python_prepare_all -} diff --git a/profiles/package.mask b/profiles/package.mask index 5550c83c19a2..4e78946ad888 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -153,7 +153,6 @@ dev-java/osgi-foundation # dev-python/pytest-virtualenv is broken. They have no revdeps left. # Removal on 2024-02-10. Bug #921836. dev-python/pytest-fixture-config -dev-python/pytest-shutil # Andreas Sturmlechner <ast...@gentoo.org> (2023-12-25) # Masked until KF6 is unmasked.