summaryrefslogtreecommitdiff
path: root/dev-vcs/git-pw
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-10-01 20:54:53 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-10-01 20:54:53 +0100
commit391b5b359a346aff490103da7dddc85047f83830 (patch)
tree29eea460a0bd7e1ff21d43b9d6df9af4d8a175e1 /dev-vcs/git-pw
parentc719fdcee603a5a706a45d10cb598762d56a727d (diff)
gentoo resync : 01.10.2021
Diffstat (limited to 'dev-vcs/git-pw')
-rw-r--r--dev-vcs/git-pw/Manifest5
-rw-r--r--dev-vcs/git-pw/files/git-pw-2.1.1-test.patch28
-rw-r--r--dev-vcs/git-pw/git-pw-2.1.1.ebuild (renamed from dev-vcs/git-pw/git-pw-2.0.0.ebuild)2
3 files changed, 33 insertions, 2 deletions
diff --git a/dev-vcs/git-pw/Manifest b/dev-vcs/git-pw/Manifest
index 6e395ae3278f..43b2c57c0dcc 100644
--- a/dev-vcs/git-pw/Manifest
+++ b/dev-vcs/git-pw/Manifest
@@ -1,3 +1,4 @@
-DIST git-pw-2.0.0.tar.gz 32151 BLAKE2B f8ef04b31cb4457ac9bae333bae65deb7d17469cd25a3724a27201dab0c05f98151a5ec1066cb9d2de81d82360f4e46eaa59ebd08904dfa0d16106f589e17e4c SHA512 83ac4d56091bfe9b03733939fb3e4feab22ce4455eebe8508bc730705b69054a2f060cfb8a1ea469476d9519809a89116ff56210efe4cd76e50df5a5d40886fc
-EBUILD git-pw-2.0.0.ebuild 1037 BLAKE2B 8733ba74e1410b1646ffef903050bf536911d4b24150156775c594f5b9a58d84dc7e5d6d73e0a315a90cad6d8ce9d488b7425d49173a7f4c2830333cc292f46a SHA512 805faf949e13acfc57ee862dc8c57aea69425d2b9c2cfe8d2e6501907a940f1930d88b24aae803e999a97d3c595cc1c6301cd6efbc6196277c8e62302f585c40
+AUX git-pw-2.1.1-test.patch 1048 BLAKE2B e44d85ed1b0073a0c4b3e9f044e5f6d79612f9acc2a3b65dab9d4bf653c3364935203741346ca56cf6d3b0b75550954616289ed6a86f49cab7ab5fbc84cdf3a7 SHA512 6b5741a95c35cc19afac0d5f1485fb85290d2a9eb9938f65eed83b0bf016101e0321262685687d57c52abe4cdd18a1d33ab632df5c37b59a26386161ecc17956
+DIST git-pw-2.1.1.tar.gz 32489 BLAKE2B 516eb3b81c3798a455b7122a3b0ad9bf0d9722eb6f301ea58ed766cca94137f4da4eaf34a40ec7c5e108368aa6099f9401aba6d71d463913cd2b7fd9dc7aef09 SHA512 3cbf0670bf811d6b6ef0d4c5c7ad4321380d442c62fd15869758b26b4fc375c2d4bd2bdbf693a41d0cbe862bdef15fc02d04124a089f7786bd1b2e56f818e0c2
+EBUILD git-pw-2.1.1.ebuild 1080 BLAKE2B 82442c41df4c20dadbb231d982367eadc0372ab9b3e275344dad5ccf4e1b92731c69cd3d16df200272415abcffd2717239840f9ccf48fa33b739c4a8a70c57c6 SHA512 62efae093f24d7c0ffeba0a3bd9503e92185c3d7596c2c6e98cdbe2051379a74b8044e519d673e2fd57e68b6fae6c6bd4e71d191f9de1bdebfc56c9c91e74b06
MISC metadata.xml 573 BLAKE2B ea8a1646462b2ff59f05531d1964c160216b7c19b17e261a75940e591106195050ad9ba65f3b5ea594d4a4ad53cfda7cf7dbb1894c6ac850a6b5c9e189093432 SHA512 cc0a718a6d9bd29c5a77dc3f23a4f4b691ab0c954c6c2a7266126c2cbc312aab73e5484120bad031e77abcf0c1cbff2c7af998700e45eebc51fd73facc988f8c
diff --git a/dev-vcs/git-pw/files/git-pw-2.1.1-test.patch b/dev-vcs/git-pw/files/git-pw-2.1.1-test.patch
new file mode 100644
index 000000000000..00df55f872d1
--- /dev/null
+++ b/dev-vcs/git-pw/files/git-pw-2.1.1-test.patch
@@ -0,0 +1,28 @@
+From 08152c86d02c36c425047fa9220d6d5ac3fcda01 Mon Sep 17 00:00:00 2001
+From: Matt Smith <matt@offtopica.uk>
+Date: Sun, 26 Sep 2021 19:55:40 +0100
+Subject: [PATCH] tests: Unset PAGER env when testing fallback
+
+Prior to this commit, the test test_echo_via_pager_env_default will
+fail when $PAGER is set to /usr/bin/less (or anything other than
+"less"). Use unittest.mock to unset the environment variable during
+the test.
+---
+ tests/test_utils.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/test_utils.py b/tests/test_utils.py
+index cf75a55..a0974f1 100644
+--- a/tests/test_utils.py
++++ b/tests/test_utils.py
+@@ -75,6 +75,7 @@ def test_echo_via_pager_env_PAGER(mock_inner, mock_tabulate, mock_config):
+ @mock.patch.object(utils, 'git_config', return_value=None)
+ @mock.patch.object(utils, '_tabulate')
+ @mock.patch.object(utils, '_echo_via_pager')
++@mock.patch.dict(os.environ, {'PAGER': ''})
+ def test_echo_via_pager_env_default(mock_inner, mock_tabulate, mock_config):
+ utils.echo_via_pager('test', ('foo',), None)
+
+--
+2.33.0
+
diff --git a/dev-vcs/git-pw/git-pw-2.0.0.ebuild b/dev-vcs/git-pw/git-pw-2.1.1.ebuild
index a27a91f9a2c5..dd63e27b733c 100644
--- a/dev-vcs/git-pw/git-pw-2.0.0.ebuild
+++ b/dev-vcs/git-pw/git-pw-2.1.1.ebuild
@@ -21,6 +21,8 @@ LICENSE="MIT"
SLOT="0"
IUSE=""
+PATCHES=( "${FILESDIR}/${P}-test.patch" )
+
RDEPEND="
>=dev-python/arrow-0.10[${PYTHON_USEDEP}]
<dev-python/click-8.0[${PYTHON_USEDEP}]