[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-pw/files/, dev-vcs/git-pw/

[Yixun Lan]

commit:     ac46e6fd67d556a1cdb2d9c37647cd5cd9603a19
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 24 14:14:15 2021 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 14:14:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac46e6fd

dev-vcs/git-pw: version bump, 2.2.3

Closes: https://bugs.gentoo.org/816129
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 dev-vcs/git-pw/Manifest                            |  2 +-
 dev-vcs/git-pw/files/git-pw-2.1.1-test.patch       | 28 ----------------------
 .../{git-pw-2.1.1.ebuild => git-pw-2.2.3.ebuild}   |  4 +---
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/dev-vcs/git-pw/Manifest b/dev-vcs/git-pw/Manifest
index 10daf2fac340..7108c3dc8dd3 100644
--- a/dev-vcs/git-pw/Manifest
+++ b/dev-vcs/git-pw/Manifest
@@ -1 +1 @@
-DIST git-pw-2.1.1.tar.gz 32489 BLAKE2B 516eb3b81c3798a455b7122a3b0ad9bf0d9722eb6f301ea58ed766cca94137f4da4eaf34a40ec7c5e108368aa6099f9401aba6d71d463913cd2b7fd9dc7aef09 SHA512 3cbf0670bf811d6b6ef0d4c5c7ad4321380d442c62fd15869758b26b4fc375c2d4bd2bdbf693a41d0cbe862bdef15fc02d04124a089f7786bd1b2e56f818e0c2
+DIST git-pw-2.2.3.tar.gz 33605 BLAKE2B 6f8b72b1ef8cda3f5dea568ad0e872d3c8f1795bf9889b76cd281bc19b303a903baa38a89036511b2d1496b258b37e843fcbc333f5a86735bcae6f3d22f3a320 SHA512 06a34e1cc3a7b32b44a6042abf17d00f5b648039ce091885bf19638457f3800f2daecbcd03ae9da2f48166bac53a2219735e251145302bcc98a9cd29fab7450f

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
deleted file mode 100644
index 00df55f872d1..000000000000
--- a/dev-vcs/git-pw/files/git-pw-2.1.1-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 08152c86d02c36c425047fa9220d6d5ac3fcda01 Mon Sep 17 00:00:00 2001
-From: Matt Smith <matt@×××××××××.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')
-+@××××××××××.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.1.1.ebuild b/dev-vcs/git-pw/git-pw-2.2.3.ebuild
similarity index 92%
rename from dev-vcs/git-pw/git-pw-2.1.1.ebuild
rename to dev-vcs/git-pw/git-pw-2.2.3.ebuild
index dd63e27b733c..22909ec1618a 100644
--- a/dev-vcs/git-pw/git-pw-2.1.1.ebuild
+++ b/dev-vcs/git-pw/git-pw-2.2.3.ebuild
@@ -21,8 +21,6 @@ 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}]
@@ -34,7 +32,7 @@ BDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/mock-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/pytest-6.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-cov-2.5[${PYTHON_USEDEP}]
 	)
 "