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 944d4f2d96b..00000000000 --- 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 3d04ae447af..9894f277138 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 }