[gentoo-commits] repo/gentoo:master commit in: dev-python/sh/, dev-python/sh/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/sh/, dev-python/sh/files/

[Michał Górny]

commit:     de3a67e59307712134c89e074d539149dda15996
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 15:39:04 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 15:40:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de3a67e5

dev-python/sh: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/sh/Manifest                     |  1 -
 dev-python/sh/files/sh-1.12.14-tests.patch | 43 ------------------------------
 dev-python/sh/sh-1.12.14.ebuild            | 29 --------------------
 3 files changed, 73 deletions(-)

diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index 9b5e5a0e3f3..7a8fd5dce64 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,2 +1 @@
-DIST sh-1.12.14.tar.gz 56861 BLAKE2B dcab86c518fdfdf763053f05a6701fbd0faa76e05d710d6ef709dca89b7527157385ecde355f5f358ba08f7da8e551712732ef43f3074f5568fc7092ed12f014 SHA512 5f2daa2666cf8efe90ba550c8ea5875f2a8812d787597c9d9b933f58feccd192e1ec0ab5695b756bdbfbf9748d106c2045be20838e680b31dac3f778970b5786
 DIST sh-1.14.0.tar.gz 63313 BLAKE2B 9975944455077729d172a34dcf7847930f9bb943d5345729a9c09afeb411de72b59cd5e4f1192406ba8430a26439acd2ee4d477b10f31b5e55be936c711f70a9 SHA512 816c0562f4f779ba79b5206d151893cd5043898d1b74ee109c0ea67f862a097ab9c7509e4a20459fc623f14fa3fb1a9e2a2ccec8257a68fcba14414779a20128

diff --git a/dev-python/sh/files/sh-1.12.14-tests.patch b/dev-python/sh/files/sh-1.12.14-tests.patch
deleted file mode 100644
index bc3d1b59fef..00000000000
--- a/dev-python/sh/files/sh-1.12.14-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/test.py b/test.py
-index 68ef40c..640e5b5 100644
---- a/test.py
-+++ b/test.py
-@@ -515,6 +515,13 @@ def test_environment(self):
-             "VERSIONER_PYTHON_VERSION",
-         ]
-
-+        # On python-3.7+, the changes for no encoding inject LC_CTYPE into subprocesses
-+        py37_extra_envvars = [
-+            "LC_CTYPE",
-+        ]
-+
-+        prune_envvars = osx_cruft + py37_extra_envvars
-+
-         # first we test that the environment exists in our child process as
-         # we've set it
-         py = create_tmp_test("""
-@@ -525,7 +532,7 @@ def test_environment(self):
-     try: del os.environ[key]
-     except: pass
- print(os.environ["HERP"] + " " + str(len(os.environ)))
--""" % osx_cruft)
-+""" % prune_envvars)
-         out = python(py.name, _env=env).strip()
-         self.assertEqual(out, "DERP 1")
-
-@@ -533,12 +540,12 @@ def test_environment(self):
- import os, sys
- sys.path.insert(0, os.getcwd())
- import sh
--osx_cruft = %s
--for key in osx_cruft:
-+prune_envvars = %s
-+for key in prune_envvars:
-     try: del os.environ[key]
-     except: pass
- print(sh.HERP + " " + str(len(os.environ)))
--""" % osx_cruft)
-+""" % prune_envvars)
-         out = python(py.name, _env=env, _cwd=THIS_DIR).strip()
-         self.assertEqual(out, "DERP 1")
-

diff --git a/dev-python/sh/sh-1.12.14.ebuild b/dev-python/sh/sh-1.12.14.ebuild
deleted file mode 100644
index 57ff7f3454d..00000000000
--- a/dev-python/sh/sh-1.12.14.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python subprocess interface"
-HOMEPAGE="https://github.com/amoffat/sh"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
-
-	# https://github.com/amoffat/sh/pull/468
-	"${FILESDIR}/sh-1.12.14-tests.patch"
-)
-
-python_test() {
-	"${EPYTHON}" test.py || die "Tests fail with ${EPYTHON}"
-}

[gentoo-commits] repo/gentoo:master commit in: dev-python/sh/, dev-python/sh/files/

[Michał Górny]

commit:     ecfafb5ad934134f14850e3c27b455cc74c36462
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 06:59:08 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Apr 18 07:05:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecfafb5a

dev-python/sh: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/sh/Manifest                             |  1 -
 dev-python/sh/files/sh-1.14.0-fix-sleep-test.patch | 33 ----------------------
 dev-python/sh/sh-1.14.0.ebuild                     | 27 ------------------
 3 files changed, 61 deletions(-)

diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index 3febc4b9ae5..1d4acecd50c 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,2 +1 @@
-DIST sh-1.14.0.tar.gz 63313 BLAKE2B 9975944455077729d172a34dcf7847930f9bb943d5345729a9c09afeb411de72b59cd5e4f1192406ba8430a26439acd2ee4d477b10f31b5e55be936c711f70a9 SHA512 816c0562f4f779ba79b5206d151893cd5043898d1b74ee109c0ea67f862a097ab9c7509e4a20459fc623f14fa3fb1a9e2a2ccec8257a68fcba14414779a20128
 DIST sh-1.14.1.tar.gz 63317 BLAKE2B e4439a54d4bf2c106ae5217b55d6fa19f2bc369fb63e8515954a017fd2e98eca88fce07ea3efa70b3c427826bec657aa75c057a09c88de76c1595ef89465ee32 SHA512 9a4d9b841e81ae465b036f3fbf5e8ca277b090ffada660b17e9c2c457e09f7dbb0038b687fc0c0f4a6d575a55deb451c572a60f92f8c8d18ea65d6d902abb9b4

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
deleted file mode 100644
index 28d1ec9847f..00000000000
--- a/dev-python/sh/files/sh-1.14.0-fix-sleep-test.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 83b189de4f461ed0370b0472f1938d3162ed00c7 Mon Sep 17 00:00:00 2001
-From: David Runge <dave@sleepmap.de>
-Date: Tue, 1 Sep 2020 23:18:13 +0200
-Subject: [PATCH] Remove hardcoded path for sleep executable
-
-test.py:
-In test_timeout the path for the sleep executable has been hardcoded to
-be /bin/sleep. However, on operating systems such as Arch Linux, Fedora
-or Solaris the executable resides in /usr/bin/sleep due to a /usr merge
-(e.g. see
-  https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/).
-By only checking for the name of the executable and its parameter the
-test becomes more generic and thus can run on any (Unix-like) operating
-system (given that `sleep` is in PATH).
-
-Fixes #539
----
- test.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test.py b/test.py
-index f8029c04..142fcc0d 100644
---- a/test.py
-+++ b/test.py
-@@ -2014,7 +2014,7 @@ def test_timeout(self):
-         try:
-             sh.sleep(sleep_for, _timeout=timeout).wait()
-         except sh.TimeoutException as e:
--            self.assertEqual(e.full_cmd, '/bin/sleep 3')
-+            assert 'sleep 3' in e.full_cmd
-         else:
-             self.fail("no timeout exception")
-         elapsed = time() - started

diff --git a/dev-python/sh/sh-1.14.0.ebuild b/dev-python/sh/sh-1.14.0.ebuild
deleted file mode 100644
index 81607b3f3c8..00000000000
--- a/dev-python/sh/sh-1.14.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python subprocess interface"
-HOMEPAGE="https://github.com/amoffat/sh"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
-
-PATCHES=(
-	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
-	"${FILESDIR}/sh-1.14.0-skip-unreliable-test.patch"
-	# https://github.com/amoffat/sh/pull/540
-	"${FILESDIR}/sh-1.14.0-fix-sleep-test.patch"
-)
-
-python_test() {
-	"${EPYTHON}" test.py || die "Tests fail with ${EPYTHON}"
-}