1 |
commit: ecfafb5ad934134f14850e3c27b455cc74c36462 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 18 06:59:08 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 18 07:05:51 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecfafb5a |
7 |
|
8 |
dev-python/sh: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/sh/Manifest | 1 - |
13 |
dev-python/sh/files/sh-1.14.0-fix-sleep-test.patch | 33 ---------------------- |
14 |
dev-python/sh/sh-1.14.0.ebuild | 27 ------------------ |
15 |
3 files changed, 61 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest |
18 |
index 3febc4b9ae5..1d4acecd50c 100644 |
19 |
--- a/dev-python/sh/Manifest |
20 |
+++ b/dev-python/sh/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST sh-1.14.0.tar.gz 63313 BLAKE2B 9975944455077729d172a34dcf7847930f9bb943d5345729a9c09afeb411de72b59cd5e4f1192406ba8430a26439acd2ee4d477b10f31b5e55be936c711f70a9 SHA512 816c0562f4f779ba79b5206d151893cd5043898d1b74ee109c0ea67f862a097ab9c7509e4a20459fc623f14fa3fb1a9e2a2ccec8257a68fcba14414779a20128 |
23 |
DIST sh-1.14.1.tar.gz 63317 BLAKE2B e4439a54d4bf2c106ae5217b55d6fa19f2bc369fb63e8515954a017fd2e98eca88fce07ea3efa70b3c427826bec657aa75c057a09c88de76c1595ef89465ee32 SHA512 9a4d9b841e81ae465b036f3fbf5e8ca277b090ffada660b17e9c2c457e09f7dbb0038b687fc0c0f4a6d575a55deb451c572a60f92f8c8d18ea65d6d902abb9b4 |
24 |
|
25 |
diff --git a/dev-python/sh/files/sh-1.14.0-fix-sleep-test.patch b/dev-python/sh/files/sh-1.14.0-fix-sleep-test.patch |
26 |
deleted file mode 100644 |
27 |
index 28d1ec9847f..00000000000 |
28 |
--- a/dev-python/sh/files/sh-1.14.0-fix-sleep-test.patch |
29 |
+++ /dev/null |
30 |
@@ -1,33 +0,0 @@ |
31 |
-From 83b189de4f461ed0370b0472f1938d3162ed00c7 Mon Sep 17 00:00:00 2001 |
32 |
-From: David Runge <dave@××××××××.de> |
33 |
-Date: Tue, 1 Sep 2020 23:18:13 +0200 |
34 |
-Subject: [PATCH] Remove hardcoded path for sleep executable |
35 |
- |
36 |
-test.py: |
37 |
-In test_timeout the path for the sleep executable has been hardcoded to |
38 |
-be /bin/sleep. However, on operating systems such as Arch Linux, Fedora |
39 |
-or Solaris the executable resides in /usr/bin/sleep due to a /usr merge |
40 |
-(e.g. see |
41 |
- https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/). |
42 |
-By only checking for the name of the executable and its parameter the |
43 |
-test becomes more generic and thus can run on any (Unix-like) operating |
44 |
-system (given that `sleep` is in PATH). |
45 |
- |
46 |
-Fixes #539 |
47 |
---- |
48 |
- test.py | 2 +- |
49 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
50 |
- |
51 |
-diff --git a/test.py b/test.py |
52 |
-index f8029c04..142fcc0d 100644 |
53 |
---- a/test.py |
54 |
-+++ b/test.py |
55 |
-@@ -2014,7 +2014,7 @@ def test_timeout(self): |
56 |
- try: |
57 |
- sh.sleep(sleep_for, _timeout=timeout).wait() |
58 |
- except sh.TimeoutException as e: |
59 |
-- self.assertEqual(e.full_cmd, '/bin/sleep 3') |
60 |
-+ assert 'sleep 3' in e.full_cmd |
61 |
- else: |
62 |
- self.fail("no timeout exception") |
63 |
- elapsed = time() - started |
64 |
|
65 |
diff --git a/dev-python/sh/sh-1.14.0.ebuild b/dev-python/sh/sh-1.14.0.ebuild |
66 |
deleted file mode 100644 |
67 |
index 81607b3f3c8..00000000000 |
68 |
--- a/dev-python/sh/sh-1.14.0.ebuild |
69 |
+++ /dev/null |
70 |
@@ -1,27 +0,0 @@ |
71 |
-# Copyright 1999-2020 Gentoo Authors |
72 |
-# Distributed under the terms of the GNU General Public License v2 |
73 |
- |
74 |
-EAPI=7 |
75 |
- |
76 |
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} ) |
77 |
- |
78 |
-inherit distutils-r1 |
79 |
- |
80 |
-DESCRIPTION="Python subprocess interface" |
81 |
-HOMEPAGE="https://github.com/amoffat/sh" |
82 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
83 |
- |
84 |
-LICENSE="MIT" |
85 |
-SLOT="0" |
86 |
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux" |
87 |
- |
88 |
-PATCHES=( |
89 |
- "${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch" |
90 |
- "${FILESDIR}/sh-1.14.0-skip-unreliable-test.patch" |
91 |
- # https://github.com/amoffat/sh/pull/540 |
92 |
- "${FILESDIR}/sh-1.14.0-fix-sleep-test.patch" |
93 |
-) |
94 |
- |
95 |
-python_test() { |
96 |
- "${EPYTHON}" test.py || die "Tests fail with ${EPYTHON}" |
97 |
-} |