From fe212a42d50213b29aa7abb2c0752cfd506feb49 Mon Sep 17 00:00:00 2001 From: icp Date: Mon, 2 Jan 2023 01:52:34 +0530 Subject: [PATCH 1/2] python3-dulwich: update to 0.20.50. --- srcpkgs/python3-dulwich/template | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/srcpkgs/python3-dulwich/template b/srcpkgs/python3-dulwich/template index f1f45aeed9c9..154c5df96483 100644 --- a/srcpkgs/python3-dulwich/template +++ b/srcpkgs/python3-dulwich/template @@ -1,26 +1,24 @@ # Template file for 'python3-dulwich' pkgname=python3-dulwich -version=0.20.44 -revision=2 +version=0.20.50 +revision=1 build_style=python3-module +make_check_target="dulwich/tests" hostmakedepends="python3-setuptools" makedepends="python3-devel" -depends="python3-urllib3 python3-certifi" -checkdepends="${depends} python3-gevent python3-gpg gnupg" +depends="python3-urllib3" +checkdepends="${depends} python3-pytest python3-gevent python3-gpg gnupg git" short_desc="Python3 implementation of the Git file formats and protocols" maintainer="Orphaned " license="GPL-2.0-or-later, Apache-2.0" homepage="https://www.dulwich.io/" +changelog="https://raw.githubusercontent.com/jelmer/dulwich/master/NEWS" distfiles="${PYPI_SITE}/d/dulwich/dulwich-${version}.tar.gz" -checksum=10e8d73763dd30c86a99a15ade8bfcf3ab8fe96532cdf497e8cb1d11832352b8 +checksum=50a941796b2c675be39be728d540c16b5b7ce77eb9e1b3f855650ece6832d2be conflicts="python-dulwich>=0" -do_check() { - python3 -m unittest dulwich.tests.test_suite -} - post_install() { # remove extra docs - rm -rf ${DESTDIR}/usr/lib/python*/site-packages/docs + rm -rf ${DESTDIR}/${py3_sitelib}/docs } From 56f2f9fd4b321fdcbbed9ed41e24f5f0036a4d12 Mon Sep 17 00:00:00 2001 From: icp Date: Mon, 2 Jan 2023 01:52:17 +0530 Subject: [PATCH 2/2] hg-git: update to 1.0.1. --- .../patches/fix-egrep-test-errors.patch | 113 ++++++++++++++++++ .../hg-git/patches/fix-encoding-test.patch | 15 --- srcpkgs/hg-git/template | 13 +- 3 files changed, 119 insertions(+), 22 deletions(-) create mode 100644 srcpkgs/hg-git/patches/fix-egrep-test-errors.patch delete mode 100644 srcpkgs/hg-git/patches/fix-encoding-test.patch diff --git a/srcpkgs/hg-git/patches/fix-egrep-test-errors.patch b/srcpkgs/hg-git/patches/fix-egrep-test-errors.patch new file mode 100644 index 000000000000..aeca5b20604c --- /dev/null +++ b/srcpkgs/hg-git/patches/fix-egrep-test-errors.patch @@ -0,0 +1,113 @@ +--- a/tests/test-conflict-1.t ++++ b/tests/test-conflict-1.t +@@ -16,13 +16,13 @@ Load commonly used test logic + $ hg ci -m "A->C" + created new head + +- $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | egrep -v '^merging afile' | sed 's/incomplete.*/failed!/' ++ $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' + warning: conflicts.* (re) + 0 files updated, 0 files merged, 0 files removed, 1 files unresolved + use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) + resolve using first parent + $ echo C > afile +- $ hg resolve -m afile | egrep -v 'no more unresolved files' || true ++ $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true + $ hg ci -m "merge to C" + + $ hg log --graph --style compact | sed 's/\[.*\]//g' + +--- a/tests/test-conflict-2.t ++++ b/tests/test-conflict-2.t +@@ -16,13 +16,13 @@ Load commonly used test logic + $ hg ci -m "A->C" + created new head + +- $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | egrep -v '^merging afile' | sed 's/incomplete.*/failed!/' ++ $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' + warning: conflicts.* (re) + 0 files updated, 0 files merged, 0 files removed, 1 files unresolved + use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) + resolve using second parent + $ echo B > afile +- $ hg resolve -m afile | egrep -v 'no more unresolved files' || true ++ $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true + $ hg ci -m "merge to B" + + $ hg log --graph --style compact | sed 's/\[.*\]//g' + +--- a/tests/test-git-submodules.t ++++ b/tests/test-git-submodules.t +@@ -27,10 +27,10 @@ version spell it sanely as it was given (eg . in a newer version, + while older git will use the full normalized path for .) + $ clonefilt='s/Cloning into/Initialized empty Git repository in/;s/in .*/in .../' + +- $ git clone ../gitrepo1 . 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' ++ $ git clone ../gitrepo1 . 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | grep -E -v '^done\.$' + Initialized empty Git repository in ... + +- $ git submodule add ../gitsubrepo subrepo 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' ++ $ git submodule add ../gitsubrepo subrepo 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | grep -E -v '^done\.$' + Initialized empty Git repository in ... + + $ git commit -m 'add subrepo' | sed 's/, 0 deletions(-)//' +@@ -48,7 +48,7 @@ while older git will use the full normalized path for .) + [master a000567] change subrepo commit + 1 file changed, 1 insertion(+), 1 deletion(-) + +- $ git submodule add ../gitsubrepo subrepo2 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' ++ $ git submodule add ../gitsubrepo subrepo2 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | grep -E -v '^done\.$' + Initialized empty Git repository in ... + + $ git commit -m 'add another subrepo' | sed 's/, 0 deletions(-)//' +@@ -79,7 +79,7 @@ same name has existed at any point historically, so use alpha instead of subrepo + + $ git rm alpha + rm 'alpha' +- $ git submodule add ../gitsubrepo alpha 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' ++ $ git submodule add ../gitsubrepo alpha 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | grep -E -v '^done\.$' + Initialized empty Git repository in ... + + $ git commit -m 'replace file with subrepo' | sed 's/, 0 deletions(-)//' | sed 's/, 0 insertions(+)//' +@@ -98,7 +98,7 @@ replace symlink with subrepo + + $ git rm foolink + rm 'foolink' +- $ git submodule add ../gitsubrepo foolink 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' ++ $ git submodule add ../gitsubrepo foolink 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | grep -E -v '^done\.$' + Initialized empty Git repository in ... + + $ git commit -m 'replace symlink with subrepo' | sed 's/, 0 deletions(-)//' | sed 's/, 0 insertions(+)//' + +--- a/tests/test-renames.t ++++ b/tests/test-renames.t +@@ -39,7 +39,7 @@ Add a submodule (gitlink) and move it to a different spot: + $ rmpwd="import sys; print(sys.stdin.read().replace('$(dirname $(pwd))/', ''))" + $ clonefilt='s/Cloning into/Initialized empty Git repository in/;s/in .*/in .../' + +- $ git submodule add ../gitsubmodule 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' ++ $ git submodule add ../gitsubmodule 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | grep -E -v '^done\.$' + Initialized empty Git repository in ... + + $ fn_git_commit -m 'add submodule' +@@ -72,7 +72,7 @@ Rename the file back: + Rename a file elsewhere and replace it with a submodule: + + $ git mv gamma gamma-new +- $ git submodule add ../gitsubmodule gamma 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' ++ $ git submodule add ../gitsubmodule gamma 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | grep -E -v '^done\.$' + Initialized empty Git repository in ... + + $ fn_git_commit -m 'rename and add submodule' + +--- a/tests/test-subrepos.t ++++ b/tests/test-subrepos.t +@@ -33,7 +33,7 @@ Load commonly used test logic + * [new branch] master -> master + $ cd .. + Ensure gitlinks are transformed to .hgsubstate on hg pull from git +- $ hg clone -u tip repo.git hgrepo 2>&1 | egrep -v '^(Cloning into|done)' ++ $ hg clone -u tip repo.git hgrepo 2>&1 | grep -E -v '^(Cloning into|done)' + importing 3 git commits + new changesets e532b2bfda10:88c5e06a2a29 (3 drafts) + updating to branch default diff --git a/srcpkgs/hg-git/patches/fix-encoding-test.patch b/srcpkgs/hg-git/patches/fix-encoding-test.patch deleted file mode 100644 index 944d4f2d96b3..000000000000 --- a/srcpkgs/hg-git/patches/fix-encoding-test.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/tests/test-encoding.t -+++ b/tests/test-encoding.t -@@ -33,10 +33,10 @@ - $ . $TESTDIR/latin-1-encoding - Warning: commit message (did|does) not conform to UTF-8. (re) - You may want to amend it after fixing the message, or set the config -- variable i18n.commitencoding to the encoding your project uses. -+ variable i18n.commitEncoding to the encoding your project uses. - Warning: commit message (did|does) not conform to UTF-8. (re) - You may want to amend it after fixing the message, or set the config -- variable i18n.commitencoding to the encoding your project uses. -+ variable i18n.commitEncoding to the encoding your project uses. - - $ cd .. - $ git init -q --bare repo.git diff --git a/srcpkgs/hg-git/template b/srcpkgs/hg-git/template index 3d04ae447af6..9894f2771381 100644 --- a/srcpkgs/hg-git/template +++ b/srcpkgs/hg-git/template @@ -1,9 +1,9 @@ # Template file for 'hg-git' pkgname=hg-git -version=1.0.0 -revision=2 -build_style=python3-module -hostmakedepends="python3-setuptools python3-setuptools_scm" +version=1.0.1 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-dulwich mercurial" checkdepends="$depends git unzip openssh" short_desc="Mercurial plugin adding the ability to push and pull to/from Git" @@ -13,9 +13,8 @@ license="GPL-2.0-only" homepage="https://foss.heptapod.net/mercurial/hg-git" changelog="https://foss.heptapod.net/mercurial/hg-git/-/raw/branch/default/NEWS.rst" distfiles="$PYPI_SITE/h/hg-git/hg-git-$version.tar.gz" -checksum=3911833962eb9c899c6bea8fb49666c82f211b124d0840beb6ad95e23a4621b6 +checksum=3f7360f5b0f5e805fb0c969cfd8d7af064962d32000f723568b6e56080d08b29 do_check() { - cd tests - python3 run-tests.py --with-hg=/usr/bin/hg + python3 tests/run-tests.py --with-hg=/usr/bin/hg }