From 016eb4cb18225f6bfd7dfbb97774d3810419c137 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 3c613d41ff5011c122b62a139b31938a5017f3b9 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. --- srcpkgs/hg-git/patches/fix-encoding-test.patch | 15 --------------- srcpkgs/hg-git/template | 14 +++++++------- 2 files changed, 7 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/hg-git/patches/fix-encoding-test.patch 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..53fcf804541c 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,9 @@ 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 + vsed -e 's/egrep/grep -E/g' -i tests/*.t + python3 tests/run-tests.py --with-hg=/usr/bin/hg }