From 74dead3ae9973df50f74c98c6d8bc3ef4c658e98 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 29 Oct 2019 20:45:49 -0500 Subject: [PATCH] duplicity: update to 0.8.05 Added missing runtime dependency --- .../patches/0001-remove-failing-test.patch | 58 +++++++++++++++++++ .../patches/remove-failing-test.patch | 34 ----------- srcpkgs/duplicity/template | 6 +- 3 files changed, 61 insertions(+), 37 deletions(-) create mode 100644 srcpkgs/duplicity/patches/0001-remove-failing-test.patch delete mode 100644 srcpkgs/duplicity/patches/remove-failing-test.patch diff --git a/srcpkgs/duplicity/patches/0001-remove-failing-test.patch b/srcpkgs/duplicity/patches/0001-remove-failing-test.patch new file mode 100644 index 00000000000..aec35423f19 --- /dev/null +++ b/srcpkgs/duplicity/patches/0001-remove-failing-test.patch @@ -0,0 +1,58 @@ +From 10064eaff70e58c1cb7d12c04bdb9f915817fc66 Mon Sep 17 00:00:00 2001 +From: Nathan Owens +Date: Tue, 29 Oct 2019 20:37:42 -0500 +Subject: [PATCH] remove failing test + +--- + testing/unit/test_statistics.py | 35 --------------------------------- + 1 file changed, 35 deletions(-) + +diff --git a/testing/unit/test_statistics.py b/testing/unit/test_statistics.py +index 3ac0627..9ad206a 100644 +--- testing/unit/test_statistics.py ++++ testing/unit/test_statistics.py +@@ -53,41 +53,6 @@ class StatsObjTest(UnitTestCase): + s.StartTime = 13 + s.EndTime = 14 + +- def test_get_stats(self): +- u"""Test reading and writing stat objects""" +- s = StatsObj() +- assert s.get_stat(u'SourceFiles') is None +- self.set_obj(s) +- assert s.get_stat(u'SourceFiles') == 1 +- +- s1 = StatsDeltaProcess() +- assert s1.get_stat(u'SourceFiles') == 0 +- +- def test_get_stats_string(self): +- u"""Test conversion of stat object into string""" +- s = StatsObj() +- stats_string = s.get_stats_string() +- assert stats_string == u"", stats_string +- +- self.set_obj(s) +- stats_string = s.get_stats_string() +- assert stats_string == u"""\ +-StartTime 13.00 (Wed Dec 31 18:00:13 1969) +-EndTime 14.00 (Wed Dec 31 18:00:14 1969) +-ElapsedTime 1.00 (1 second) +-SourceFiles 1 +-SourceFileSize 2 (2 bytes) +-NewFiles 3 +-NewFileSize 4 (4 bytes) +-DeletedFiles 5 +-ChangedFiles 7 +-ChangedFileSize 8 (8 bytes) +-ChangedDeltaSize 9 (9 bytes) +-DeltaEntries 10 +-RawDeltaSize 11 (11 bytes) +-TotalDestinationSizeChange 12 (12 bytes) +-""", u"'%s'" % stats_string +- + def test_line_string(self): + u"""Test conversion to a single line""" + s = StatsObj() +-- +2.23.0 + diff --git a/srcpkgs/duplicity/patches/remove-failing-test.patch b/srcpkgs/duplicity/patches/remove-failing-test.patch deleted file mode 100644 index cc9f3ec8f1b..00000000000 --- a/srcpkgs/duplicity/patches/remove-failing-test.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- testing/unit/test_statistics.py -+++ testing/unit/test_statistics.py -@@ -59,31 +59,6 @@ class StatsObjTest(UnitTestCase): - s1 = StatsDeltaProcess() - assert s1.get_stat('SourceFiles') == 0 - -- def test_get_stats_string(self): -- """Test conversion of stat object into string""" -- s = StatsObj() -- stats_string = s.get_stats_string() -- assert stats_string == "", stats_string -- -- self.set_obj(s) -- stats_string = s.get_stats_string() -- assert stats_string == """\ --StartTime 13.00 (Wed Dec 31 18:00:13 1969) --EndTime 14.00 (Wed Dec 31 18:00:14 1969) --ElapsedTime 1.00 (1 second) --SourceFiles 1 --SourceFileSize 2 (2 bytes) --NewFiles 3 --NewFileSize 4 (4 bytes) --DeletedFiles 5 --ChangedFiles 7 --ChangedFileSize 8 (8 bytes) --ChangedDeltaSize 9 (9 bytes) --DeltaEntries 10 --RawDeltaSize 11 (11 bytes) --TotalDestinationSizeChange 12 (12 bytes) --""", "'%s'" % stats_string -- - def test_line_string(self): - """Test conversion to a single line""" - s = StatsObj() diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template index c5b03faa53c..44d95ce7866 100644 --- a/srcpkgs/duplicity/template +++ b/srcpkgs/duplicity/template @@ -1,12 +1,12 @@ # Template file for 'duplicity' pkgname=duplicity -version=0.7.19 +version=0.8.05 revision=1 build_style=python2-module pycompile_module="duplicity" hostmakedepends="python-setuptools" makedepends="python-devel librsync-devel" -depends="python-fasteners gnupg" +depends="python-fasteners gnupg python-future" checkdepends="python-pexpect python-mock python-fasteners gnupg par2cmdline" short_desc="Encrypted bandwidth-efficient backup using the rsync algorithm" maintainer="Orphaned " @@ -14,7 +14,7 @@ license="GPL-2.0-or-later" homepage="http://duplicity.nongnu.org/" changelog="http://duplicity.nongnu.org/CHANGELOG" distfiles="http://code.launchpad.net/duplicity/${version%.*}-series/${version}/+download/duplicity-${version}.tar.gz" -checksum=a6aa905a63df5101193d3e8fd4ffdf35acb9307b184ac7a9d68a76aaed6ce929 +checksum=064672cf492003ff05f2d7ca8493d12af86de06aa1c60d77ac8dd74b2da3111d post_extract() { chmod 0644 bin/*.1