Re: [PR PATCH] [Updated] git-review: update to 2.2.0

[spacedog <spacedog@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 459 bytes --]

There is an updated pull request by spacedog against master on the void-packages repository

https://github.com/spacedog/void-packages git-review
https://github.com/void-linux/void-packages/pull/36138

git-review: update to 2.2.0
Signed-off-by: Anton Baranov <abaranov@linuxfoundation.org>

#### Testing the changes
- I tested the changes in this PR: **YES**




A patch file from https://github.com/void-linux/void-packages/pull/36138.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-review-36138.patch --]
[-- Type: text/x-diff, Size: 6335 bytes --]

From 78c4304326eca1164cea54e1c143763144af124e Mon Sep 17 00:00:00 2001
From: Anton Baranov <abaranov@linuxfoundation.org>
Date: Fri, 11 Mar 2022 13:59:15 -0500
Subject: [PATCH 1/5] git-review: update to 2.2.0.

Signed-off-by: Anton Baranov <abaranov@linuxfoundation.org>
---
 srcpkgs/git-review/template | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git-review/template b/srcpkgs/git-review/template
index 8f97599d2408..d0a76802c407 100644
--- a/srcpkgs/git-review/template
+++ b/srcpkgs/git-review/template
@@ -1,13 +1,22 @@
 # Template file for 'git-review'
 pkgname=git-review
-version=1.28.0
-revision=6
+version=2.2.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-requests"
+checkdepends="python3-pip python3-wheel openjdk-jre openssh git tox procps-ng which"
 short_desc="Git command for submitting branches to Gerrit"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://git.openstack.org/cgit/openstack-infra/git-review/"
 distfiles="${PYPI_SITE}/g/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=8e3aabb7b9484063e49c2504d137609401e32ad5128ff2a5cf43e98d5d3dc15a
+checksum=fd97a00e5c15173eb097cef8e8b7915df96d878ad11eb62cb44983642b8f3a63
+
+do_check () {
+  # Don't run gerrit tests using java in chroot
+  # mkdir -p ~/.ssh && echo -e "Host *\n  HostkeyAlgorithms +ssh-rsa\n  PubkeyAcceptedAlgorithms +ssh-rsa" > ~/.ssh/config
+  # tox -e py3 -vv --skip-missing-interpreters=false
+  # Run only linters tests
+  tox -e linters
+}

From c85483c0ba55c0b9810cd121480a5ef47398e621 Mon Sep 17 00:00:00 2001
From: Anton Baranov <abaranov@linuxfoundation.org>
Date: Mon, 14 Mar 2022 12:56:38 -0400
Subject: [PATCH 2/5] git-review: fix tests

Signed-off-by: Anton Baranov <abaranov@linuxfoundation.org>
---
 srcpkgs/git-review/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/git-review/template b/srcpkgs/git-review/template
index d0a76802c407..0c59e8fd4703 100644
--- a/srcpkgs/git-review/template
+++ b/srcpkgs/git-review/template
@@ -5,7 +5,7 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-requests"
-checkdepends="python3-pip python3-wheel openjdk-jre openssh git tox procps-ng which"
+checkdepends="openjdk-jre openssh git tox procps-ng which"
 short_desc="Git command for submitting branches to Gerrit"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
@@ -14,9 +14,7 @@ distfiles="${PYPI_SITE}/g/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=fd97a00e5c15173eb097cef8e8b7915df96d878ad11eb62cb44983642b8f3a63
 
 do_check () {
-  # Don't run gerrit tests using java in chroot
-  # mkdir -p ~/.ssh && echo -e "Host *\n  HostkeyAlgorithms +ssh-rsa\n  PubkeyAcceptedAlgorithms +ssh-rsa" > ~/.ssh/config
-  # tox -e py3 -vv --skip-missing-interpreters=false
-  # Run only linters tests
-  tox -e linters
+  mkdir -p ~/.ssh && echo -e "Host *\n  HostkeyAlgorithms +ssh-rsa\n  PubkeyAcceptedAlgorithms +ssh-rsa" > ~/.ssh/config
+  tox -e py3 -vv --skip-missing-interpreters=false
+
 }

From 41ed7dbad92539149e623f1140e439e9d62268b6 Mon Sep 17 00:00:00 2001
From: Anton Baranov <abaranov@linuxfoundation.org>
Date: Mon, 14 Mar 2022 13:12:41 -0400
Subject: [PATCH 3/5] Fix: Lint template errors

Signed-off-by: Anton Baranov <abaranov@linuxfoundation.org>
---
 srcpkgs/git-review/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git-review/template b/srcpkgs/git-review/template
index 0c59e8fd4703..fc766eda8d0d 100644
--- a/srcpkgs/git-review/template
+++ b/srcpkgs/git-review/template
@@ -14,7 +14,6 @@ distfiles="${PYPI_SITE}/g/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=fd97a00e5c15173eb097cef8e8b7915df96d878ad11eb62cb44983642b8f3a63
 
 do_check () {
-  mkdir -p ~/.ssh && echo -e "Host *\n  HostkeyAlgorithms +ssh-rsa\n  PubkeyAcceptedAlgorithms +ssh-rsa" > ~/.ssh/config
-  tox -e py3 -vv --skip-missing-interpreters=false
-
+         mkdir -p ~/.ssh && echo -e "Host *\n  HostkeyAlgorithms +ssh-rsa\n  PubkeyAcceptedAlgorithms +ssh-rsa" > ~/.ssh/config
+         tox -e py3 -vv --skip-missing-interpreters=false
 }

From 91a4a4c6c5e0a7d6b471e5be48d6e464c2d53c93 Mon Sep 17 00:00:00 2001
From: Anton Baranov <abaranov@linuxfoundation.org>
Date: Mon, 14 Mar 2022 13:18:41 -0400
Subject: [PATCH 4/5] Chore: Install su command

Signed-off-by: Anton Baranov <abaranov@linuxfoundation.org>
---
 srcpkgs/git-review/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-review/template b/srcpkgs/git-review/template
index fc766eda8d0d..0fd6a7d4fa28 100644
--- a/srcpkgs/git-review/template
+++ b/srcpkgs/git-review/template
@@ -5,7 +5,7 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-requests"
-checkdepends="openjdk-jre openssh git tox procps-ng which"
+checkdepends="openjdk-jre openssh git tox procps-ng which util-linux"
 short_desc="Git command for submitting branches to Gerrit"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From d51f125633e0ab8ffda789fa9d8d140c7c671a68 Mon Sep 17 00:00:00 2001
From: Anton Baranov <abaranov@linuxfoundation.org>
Date: Tue, 15 Mar 2022 08:16:19 -0400
Subject: [PATCH 5/5] Fix: xlint errors

Signed-off-by: Anton Baranov <abaranov@linuxfoundation.org>
---
 srcpkgs/git-review/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git-review/template b/srcpkgs/git-review/template
index 0fd6a7d4fa28..d4ab4a5b23cb 100644
--- a/srcpkgs/git-review/template
+++ b/srcpkgs/git-review/template
@@ -13,7 +13,7 @@ homepage="https://git.openstack.org/cgit/openstack-infra/git-review/"
 distfiles="${PYPI_SITE}/g/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=fd97a00e5c15173eb097cef8e8b7915df96d878ad11eb62cb44983642b8f3a63
 
-do_check () {
-         mkdir -p ~/.ssh && echo -e "Host *\n  HostkeyAlgorithms +ssh-rsa\n  PubkeyAcceptedAlgorithms +ssh-rsa" > ~/.ssh/config
-         tox -e py3 -vv --skip-missing-interpreters=false
+do_check() {
+	mkdir -p ~/.ssh && echo -e "Host *\n  HostkeyAlgorithms +ssh-rsa\n  PubkeyAcceptedAlgorithms +ssh-rsa" > ~/.ssh/config
+	tox -e py3 -vv --skip-missing-interpreters=false
 }