Re: [PR PATCH] [Updated] python3-GitPython: adopt orphaned package and update to 3.1.26.

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

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

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

https://github.com/jcgruenhage/void-packages python3-GitPython-3.1.26_1
https://github.com/void-linux/void-packages/pull/35536

python3-GitPython: adopt orphaned package and update to 3.1.26.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES** (new packages introduced by this PR are required for the updates to GitPython)


<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-GitPython-3.1.26_1-35536.patch --]
[-- Type: text/x-diff, Size: 7888 bytes --]

From f8e46ba573124a5f4cc9161cfb0688731868b032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 11 Feb 2022 15:48:40 +0100
Subject: [PATCH 1/5] python3-smmap: update to 5.0.0.

---
 srcpkgs/python3-smmap/template | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-smmap/template b/srcpkgs/python3-smmap/template
index 2bfc12aab9f8..1c32f8252c05 100644
--- a/srcpkgs/python3-smmap/template
+++ b/srcpkgs/python3-smmap/template
@@ -1,22 +1,18 @@
 # Template file for 'python3-smmap'
 pkgname=python3-smmap
-version=2.0.5
-revision=5
+version=5.0.0
+revision=1
 wrksrc="smmap-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
-checkdepends="python3-nose"
+checkdepends="python3-pytest"
 short_desc="Sliding memory map manager (Python3)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="BSD-3-Clause"
 homepage="https://github.com/gitpython-developers/smmap"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e348efaf6ce81b8c923fb03d5b09f857c87605ff7f1d00b146d4aff9cf1fa776
-
-do_check() {
-	nosetests3 -v
-}
+checksum=265a54c1cc32742ac37204396f62680bf45295fe03a4ece82f9e63a5a08c9686
 
 post_install() {
 	vlicense LICENSE

From c1711df8f996b801b7134eb0145f07d9b755905b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 11 Feb 2022 15:48:45 +0100
Subject: [PATCH 2/5] python3-gitdb: update to 4.0.9.

---
 srcpkgs/python3-gitdb/template | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-gitdb/template b/srcpkgs/python3-gitdb/template
index 804f4970ec44..73eb021cb0f9 100644
--- a/srcpkgs/python3-gitdb/template
+++ b/srcpkgs/python3-gitdb/template
@@ -1,17 +1,20 @@
 # Template file for 'python3-gitdb'
 pkgname=python3-gitdb
-version=2.0.5
-revision=5
-wrksrc="gitdb2-${version}"
+version=4.0.9
+revision=1
+wrksrc="gitdb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-smmap"
 short_desc="Pure-Python git object database (Python3)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="BSD-3-Clause"
 homepage="https://github.com/gitpython-developers/gitdb"
-distfiles="${PYPI_SITE}/g/gitdb2/gitdb2-${version}.tar.gz"
-checksum=83361131a1836661a155172932a13c08bda2db3674e4caa32368aa6eb02f38c2
+distfiles="${PYPI_SITE}/g/gitdb/gitdb-${version}.tar.gz"
+checksum=bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa
+# FIXME: TypeError: None is not callable
+# See https://github.com/void-linux/void-packages/pull/35536#discussion_r805185677
+make_check=no
 
 post_install() {
 	vlicense LICENSE

From 375bbbb3ff33efbc11e18f0487a7017b68bd98d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 11 Feb 2022 17:45:03 +0100
Subject: [PATCH 3/5] New package: python3-pytest-sugar-0.9.4

---
 srcpkgs/python3-pytest-sugar/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-pytest-sugar/template

diff --git a/srcpkgs/python3-pytest-sugar/template b/srcpkgs/python3-pytest-sugar/template
new file mode 100644
index 000000000000..24856912f845
--- /dev/null
+++ b/srcpkgs/python3-pytest-sugar/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-sugar'
+pkgname=python3-pytest-sugar
+version=0.9.4
+revision=1
+wrksrc="pytest-sugar-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest python3-termcolor python3-packaging"
+checkdepends="${depends}"
+short_desc="Pytest plugin to improve the look and feel"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="BSD-3-Clause"
+homepage="http://pivotfinland.com/pytest-sugar"
+distfiles="${PYPI_SITE}/p/pytest-sugar/pytest-sugar-${version}.tar.gz"
+checksum=b1b2186b0a72aada6859bea2a5764145e3aaa2c1cfbb23c3a19b5f7b697563d3
+
+post_install() {
+	vlicense LICENSE
+}

From 7dc5f86fc667874bc5e2eb9609f2b7399093ed55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 11 Feb 2022 17:45:08 +0100
Subject: [PATCH 4/5] New package: python3-ddt-1.4.4

---
 srcpkgs/python3-ddt/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-ddt/template

diff --git a/srcpkgs/python3-ddt/template b/srcpkgs/python3-ddt/template
new file mode 100644
index 000000000000..7b72f8743042
--- /dev/null
+++ b/srcpkgs/python3-ddt/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-ddt'
+pkgname=python3-ddt
+version=1.4.4
+revision=1
+wrksrc=ddt-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest python3-six python3-yaml"
+short_desc="Data driven tests for pytest"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://ddt.readthedocs.io/"
+distfiles="https://github.com/datadriventests/ddt/archive/refs/tags/${version}.tar.gz"
+checksum=658c994827f84acc1b67f0d882960724328459078d4a3fdd4737c642fe0ea090
+
+post_install() {
+	vlicense LICENSE.md
+}

From 038d6f0faf34e56b226afc2a3c8552c04c2572e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 11 Feb 2022 15:48:54 +0100
Subject: [PATCH 5/5] python3-GitPython: update to 3.1.26.

---
 srcpkgs/python3-GitPython/template | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-GitPython/template b/srcpkgs/python3-GitPython/template
index 995c290b5c48..4ce259e5a109 100644
--- a/srcpkgs/python3-GitPython/template
+++ b/srcpkgs/python3-GitPython/template
@@ -1,18 +1,37 @@
 # Template file for 'python3-GitPython'
 pkgname=python3-GitPython
-version=2.1.11
-revision=5
+version=3.1.26
+revision=1
 wrksrc="GitPython-${version}"
 build_style=python3-module
+make_check_args="--deselect test/test_base.py::TestBase::test_with_rw_remote_and_rw_repo
+ --deselect test/test_git.py::TestGit::test_refresh
+ --deselect test/test_remote.py::TestRemote::test_base
+ --deselect test/test_diff.py::TestDiff::test_diff_with_staged_file
+ --deselect test/test_docs.py::Tutorials::test_init_repo_object
+ --deselect test/test_docs.py::Tutorials::test_references_and_objects
+ --deselect test/test_refs.py::TestRefs::test_head_reset
+ --deselect test/test_repo.py::TestRepo::test_rebasing
+ --deselect test/test_submodule.py::TestSubmodule::test_git_submodules_and_add_sm_with_new_commit"
 hostmakedepends="python3-setuptools"
 depends="python3-gitdb"
+checkdepends="${depends} python3-pytest-sugar python3-coverage python3-pytest-cov python3-toml
+ python3-mypy flake8 python3-ddt git python3-virtualenv"
 short_desc="Library to interact with Git repositories (Python3)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="BSD-3-Clause"
 homepage="https://github.com/gitpython-developers/GitPython"
-distfiles="${PYPI_SITE}/G/GitPython/GitPython-${version}.tar.gz"
-checksum=8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8
+distfiles="https://github.com/gitpython-developers/GitPython/archive/refs/tags/${version}.tar.gz"
+checksum=47c82a6370a186bd426be2e8435ddbb60b254fb86f3fad2ed4028e6237e9d3d1
 
 post_install() {
 	vlicense LICENSE
 }
+
+pre_check() {
+	git clone https://github.com/gitpython-developers/GitPython GitPython-test-checkout
+	cd GitPython-test-checkout
+	git checkout ${version}
+	yes | ./init-tests-after-clone.sh
+	export GIT_PYTHON_TEST_GIT_REPO_BASE="${PWD}"
+}