From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 May 2021 20:59:14 +0100 Subject: gentoo resync : 31.05.2021 --- dev-python/send2trash/Manifest | 5 ++-- .../send2trash-1.5.0-fix-broken-tests-on-py2.patch | 29 ---------------------- dev-python/send2trash/metadata.xml | 2 +- dev-python/send2trash/send2trash-1.5.0-r1.ebuild | 12 +++------ 4 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 dev-python/send2trash/files/send2trash-1.5.0-fix-broken-tests-on-py2.patch (limited to 'dev-python/send2trash') diff --git a/dev-python/send2trash/Manifest b/dev-python/send2trash/Manifest index 3a16858bf2c4..84c05f7ad0a6 100644 --- a/dev-python/send2trash/Manifest +++ b/dev-python/send2trash/Manifest @@ -1,4 +1,3 @@ -AUX send2trash-1.5.0-fix-broken-tests-on-py2.patch 862 BLAKE2B 1d0e43f642c47f5b9f56c5e82361c7376501c0b1f5f34573b6a954bf849f26fe9d2bac456ec474c1cef0a24d62a0481a5a62d04b92c943556b97d45e574e410a SHA512 2b63d6fd6c684c950fb3e60df5412931e95dbab18c360a0d3c21a3a99ed011a2c494cd74b1fae933de1e2edc81e7bb9b6f7d46f84c1b04f9c6b3c1b6b6876fa8 DIST Send2Trash-1.5.0.tar.gz 10892 BLAKE2B 36b51f1859a3b40aa5d9b619491a13da8453ff6615e71423724131a2a88207665d3fbaeef49ecc0ff02b77738d02023c08543d8a759cc0807d74740a8af9b9de SHA512 3c08ef513e5707cd4ac82290b326bb19161222c7a84b8ffd494789ba9858929241f55ea55482947af464c14e32fea27bd92cd762a32a1d55e2daf2e21fd63172 -EBUILD send2trash-1.5.0-r1.ebuild 586 BLAKE2B 5bff89f76608a6f71c8b91ddf046bca64192e77bc2d3a8a4fb23be36911bb0132f5a4e2338bc44957dea654f3978d28cbf65fa016c30a0be0494430c745ca820 SHA512 24a6dbfa588f02ab5b5bd7a76482caa610dc3b1eee672b0fbb24fc04efba39920f893dac590b46037a9a3d438a7ccd61f4d3399c797b13fbc5d28001ab186e2d -MISC metadata.xml 381 BLAKE2B 5afbd1afb5fab636015e710ae55c2e7b6c9eb24d1ffe0418f4ae4c6d02befdf4d50922d25ae6dcd134e2f17de1cc5a7bcee0467cdfc03ac86cbf5b31d33153dd SHA512 309a92e88f854e9384519bb8a959025c97a8c75a7ee317a17d2c51c0a444b0fa008fd46fbbe07be3dd95ab2fc1930cfdf2a0c6df7ce68fc190610176f841067c +EBUILD send2trash-1.5.0-r1.ebuild 527 BLAKE2B 69dbba6460b35ac80d564a5d64c72119dfe3778fc987e29e554814845bc63756e846bd63416bd5c1085ced1bf78c1ea79d4b129d0f357f6fb89eb8618ab19da3 SHA512 c2100a073612f7bff10a06179d8feca10f90137b834900d03d37740bd481c215cc455bd373a9e3b38af1e8f27ee976f4942ac9d27cbcfdba5e85989af4e94087 +MISC metadata.xml 385 BLAKE2B 49af248f1b1b2495658177330e1a0af6a56c3b913c6ec36bfa9e9370f40e66c4de1e5537231103155b1818898a445b1caf6b0583c20d441d5e7fd495ac7114ec SHA512 111e3e77734f765a47cbaf2205e42c96da88b5dc8c2cd0a1e3319aedd7a451a9e330b6fc0ada86c6166cfc9e7357d62ef7f14ccb7ee3d0dbfd2b5e31885ccf49 diff --git a/dev-python/send2trash/files/send2trash-1.5.0-fix-broken-tests-on-py2.patch b/dev-python/send2trash/files/send2trash-1.5.0-fix-broken-tests-on-py2.patch deleted file mode 100644 index 3f2a64ca2a21..000000000000 --- a/dev-python/send2trash/files/send2trash-1.5.0-fix-broken-tests-on-py2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 74352462f5df2cb5708b96458b81afef3070c800 Mon Sep 17 00:00:00 2001 -From: Virgil Dupras -Date: Thu, 26 Jul 2018 08:30:39 -0400 -Subject: [PATCH] Fix broken tests on py2 - ---- - tests/test_plat_other.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/tests/test_plat_other.py b/tests/test_plat_other.py -index b94295d..ae4f391 100644 ---- a/tests/test_plat_other.py -+++ b/tests/test_plat_other.py -@@ -6,7 +6,11 @@ from os import path as op - import send2trash.plat_other - from send2trash.plat_other import send2trash as s2t - from send2trash.compat import PY3 --from configparser import ConfigParser -+try: -+ from configparser import ConfigParser -+except ImportError: -+ # py2 -+ from ConfigParser import ConfigParser - from tempfile import mkdtemp, NamedTemporaryFile, mktemp - import shutil - import stat --- -2.16.4 - diff --git a/dev-python/send2trash/metadata.xml b/dev-python/send2trash/metadata.xml index 9dd529756191..706dea08435a 100644 --- a/dev-python/send2trash/metadata.xml +++ b/dev-python/send2trash/metadata.xml @@ -7,6 +7,6 @@ Send2Trash - hsoft/send2trash + arsenetar/send2trash diff --git a/dev-python/send2trash/send2trash-1.5.0-r1.ebuild b/dev-python/send2trash/send2trash-1.5.0-r1.ebuild index e784dc366bd0..de7f741d8910 100644 --- a/dev-python/send2trash/send2trash-1.5.0-r1.ebuild +++ b/dev-python/send2trash/send2trash-1.5.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit distutils-r1 @@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="Sends files to the Trash (or Recycle Bin)" HOMEPAGE=" https://pypi.org/project/Send2Trash/ - https://github.com/hsoft/send2trash" + https://github.com/arsenetar/send2trash/" SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" S="${WORKDIR}"/${MY_P} @@ -21,8 +21,4 @@ SLOT="0" LICENSE="BSD" KEYWORDS="amd64 ~arm64 x86" -distutils_enable_tests setup.py - -PATCHES=( - "${FILESDIR}/${P}-fix-broken-tests-on-py2.patch" -) +distutils_enable_tests pytest -- cgit v1.2.3