1 |
commit: 5c46947a8668bec825a57bdcd9074fc91b772407 |
2 |
Author: Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch> |
3 |
AuthorDate: Sun May 30 14:13:48 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 30 16:53:48 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c46947a |
7 |
|
8 |
dev-python/send2trash: Bump to python 3.10 and removed the old patch |
9 |
|
10 |
The patch is needed only for python 2 which is not supported anymore |
11 |
|
12 |
Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch> |
13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
14 |
|
15 |
.../send2trash-1.5.0-fix-broken-tests-on-py2.patch | 29 ---------------------- |
16 |
dev-python/send2trash/send2trash-1.5.0-r1.ebuild | 10 +++----- |
17 |
2 files changed, 3 insertions(+), 36 deletions(-) |
18 |
|
19 |
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 |
20 |
deleted file mode 100644 |
21 |
index 3f2a64ca2a2..00000000000 |
22 |
--- a/dev-python/send2trash/files/send2trash-1.5.0-fix-broken-tests-on-py2.patch |
23 |
+++ /dev/null |
24 |
@@ -1,29 +0,0 @@ |
25 |
-From 74352462f5df2cb5708b96458b81afef3070c800 Mon Sep 17 00:00:00 2001 |
26 |
-From: Virgil Dupras <hsoft@×××××××××.net> |
27 |
-Date: Thu, 26 Jul 2018 08:30:39 -0400 |
28 |
-Subject: [PATCH] Fix broken tests on py2 |
29 |
- |
30 |
---- |
31 |
- tests/test_plat_other.py | 6 +++++- |
32 |
- 1 file changed, 5 insertions(+), 1 deletion(-) |
33 |
- |
34 |
-diff --git a/tests/test_plat_other.py b/tests/test_plat_other.py |
35 |
-index b94295d..ae4f391 100644 |
36 |
---- a/tests/test_plat_other.py |
37 |
-+++ b/tests/test_plat_other.py |
38 |
-@@ -6,7 +6,11 @@ from os import path as op |
39 |
- import send2trash.plat_other |
40 |
- from send2trash.plat_other import send2trash as s2t |
41 |
- from send2trash.compat import PY3 |
42 |
--from configparser import ConfigParser |
43 |
-+try: |
44 |
-+ from configparser import ConfigParser |
45 |
-+except ImportError: |
46 |
-+ # py2 |
47 |
-+ from ConfigParser import ConfigParser |
48 |
- from tempfile import mkdtemp, NamedTemporaryFile, mktemp |
49 |
- import shutil |
50 |
- import stat |
51 |
--- |
52 |
-2.16.4 |
53 |
- |
54 |
|
55 |
diff --git a/dev-python/send2trash/send2trash-1.5.0-r1.ebuild b/dev-python/send2trash/send2trash-1.5.0-r1.ebuild |
56 |
index e784dc366bd..7e7a2b9a85a 100644 |
57 |
--- a/dev-python/send2trash/send2trash-1.5.0-r1.ebuild |
58 |
+++ b/dev-python/send2trash/send2trash-1.5.0-r1.ebuild |
59 |
@@ -1,9 +1,9 @@ |
60 |
-# Copyright 1999-2020 Gentoo Authors |
61 |
+# Copyright 1999-2021 Gentoo Authors |
62 |
# Distributed under the terms of the GNU General Public License v2 |
63 |
|
64 |
EAPI=7 |
65 |
|
66 |
-PYTHON_COMPAT=( python3_{7..9} ) |
67 |
+PYTHON_COMPAT=( python3_{7..10} ) |
68 |
|
69 |
inherit distutils-r1 |
70 |
|
71 |
@@ -21,8 +21,4 @@ SLOT="0" |
72 |
LICENSE="BSD" |
73 |
KEYWORDS="amd64 ~arm64 x86" |
74 |
|
75 |
-distutils_enable_tests setup.py |
76 |
- |
77 |
-PATCHES=( |
78 |
- "${FILESDIR}/${P}-fix-broken-tests-on-py2.patch" |
79 |
-) |
80 |
+distutils_enable_tests pytest |