commit:     56efc948db4c19f3f65a26ff7e943e8563f633be
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 12 04:41:03 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug  3 18:48:31 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56efc948

app-backup/duplicity: switch tarballs, wire up testsuite again

* Switch to tarballs from gitlab as the pypi sdist lacks the testsuite,
  see 
https://lists.nongnu.org/archive/html/duplicity-announce/2025-06/msg00001.html.

  No interesting differences otherwise between the tarballs.

* Enable tests again w/ d_e_t pytest, skipping lint tests that aren't
  relevant to packaging.

* Drop obsolete test dep (mock).

Bug: https://bugs.gentoo.org/920671
Closes: https://bugs.gentoo.org/959942
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-backup/duplicity/Manifest               |  2 +-
 app-backup/duplicity/duplicity-3.0.5.ebuild | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index ea300baa99a0..f54e77e4bc45 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -1,3 +1,3 @@
 DIST duplicity-3.0.3.2.tar.gz 1929330 BLAKE2B 
00c33519edca5eb4f4468cf510381b8177a042d86eb1256105c61b42a7e712bad7b57f4a23997d1c85d0ccddb758f53e88fa0d1725fc8fe054a1a54f82cb64c8
 SHA512 
6c7917fede2b049ef1c6c49778a38dd8bb100cece2f66e49b311057400bca6dc3396ae0598176ec478ad9f0fbc6c896f06fe46b90e3ac0469fb6d5d2ad8bcaab
 DIST duplicity-3.0.4.0.tar.gz 1925286 BLAKE2B 
99c8b6e9d2d5f6f14254cbbf7f4cbeee097ab258915af1847ab1d6ad18b6a6a66f0db1dc3fc4a1ac6829f3a4019666208f3211bcdf60323370f52cc1ba46236b
 SHA512 
c40f29a38863903f0e0f1930bf44ffcbc0333a94016c5345f28dec146a6a4b9cfa31662cd6cc66690afef0ce611d7cfaaaf245be47cc9f719d8dca7dc7f3f2c5
-DIST duplicity-3.0.5.tar.gz 900129 BLAKE2B 
9b23515ca2d22394646c8dbc327de9631de45bb8aeddac682eb9bf03136691465d8fbd72070c952d8ea79a26825f442ec2fb93e7d833c795861b67c56afe7516
 SHA512 
a1810bf3b759bb36babea252131f838bbbcc50863103b7590e8bd54cdd83cbf1de460569f193ccff0e86e909408095a3db096fbfbbffeb773f7b317ee36edda5
+DIST duplicity-rel.3.0.5.tar.bz2 952327 BLAKE2B 
a5befdcfbca07655b690c681a7858e181029f6432583006872d9a1fe446a157717d6bfdc8462b087d719548ad8e761efb35b37ee23441bd7ed7830cbf5ed1612
 SHA512 
c57cd0192989ea98ef297aa5eb1e80f32f885af8c035521fffed115e2bd77af187b726a500e8d2e3f4100b00490cc62079dcba4568ca0d17239763477d3e7cb5

diff --git a/app-backup/duplicity/duplicity-3.0.5.ebuild 
b/app-backup/duplicity/duplicity-3.0.5.ebuild
index 5ff648d48381..5bbe83a473bd 100644
--- a/app-backup/duplicity/duplicity-3.0.5.ebuild
+++ b/app-backup/duplicity/duplicity-3.0.5.ebuild
@@ -2,14 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_10 python3_11 python3_12 python3_13 )
+
+PYTHON_COMPAT=( python3_{11..13} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_EXT=1
 
-inherit distutils-r1 pypi
+inherit distutils-r1
 
 DESCRIPTION="Secure backup system using gnupg to encrypt data"
 HOMEPAGE="https://duplicity.gitlab.io/";
+SRC_URI="https://gitlab.com/duplicity/duplicity/-/archive/rel.${PV}/${PN}-rel.${PV}.tar.bz2";
+S="${WORKDIR}"/${PN}-rel.${PV}
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -26,7 +29,6 @@ DEPEND="${CDEPEND}
        dev-python/setuptools-scm[${PYTHON_USEDEP}]
        test? (
                app-arch/par2cmdline
-               dev-python/mock[${PYTHON_USEDEP}]
                dev-python/pexpect[${PYTHON_USEDEP}]
        )
 "
@@ -35,15 +37,18 @@ RDEPEND="${CDEPEND}
        s3? ( dev-python/boto3[${PYTHON_USEDEP}] )
 "
 
-RESTRICT="test"
+EPYTEST_DESELECT=(
+       # Linting tests (black, pylint, etc); not relevant for us
+       testing/test_code.py::CodeTest::test_black
+       testing/test_code.py::CodeTest::test_pep8
+       testing/test_code.py::CodeTest::test_pylint
+)
 
 PATCHES=(
        "${FILESDIR}/${P}-fix-docs-cmd.patch"
 )
 
-python_test() {
-       esetup.py test
-}
+distutils_enable_tests pytest
 
 pkg_postinst() {
        elog "Duplicity has many optional dependencies to support various 
backends."

Reply via email to