Giovanni Bechis <giova...@paclan.it> writes: > On 08/28/14 00:57, Jason Tubnor wrote: >> On 27 August 2014 21:29, Jérémie Courrèges-Anglas <j...@wxcvbn.org> wrote: >>> Untested so far, one nit below.
[...] >>> ... the files are added here anyway. The CHANGELOG says that it was >>> fixed in this release, so it probably makes sense to ship those files >>> now. Anyone with a dropbox account? >>> >>> >> Correct, it isn't right. It is either included or not included :-) >> >> I have just created a dropbox account specifically for testing, it isn't a >> feature that I use duplicity for. All my testing was done on amd64, macppc >> with par2 (with and without), AWS S3, file and sftp. >> >> Dropbox testing has failed. The py-dropbox API is needed it looks like, >> something else for me to look at if this feature is to be used. At this >> point, I think, leave the @comment intact for the dpbxbackend and I'll >> revisit its inclusion when I have sorted the dependencies. >> >> Thoughts? >> > "from dropbox import client, rest, session", maybe py-dropbox or something > like that should be ported ? While dropbox support might sound like a nice idea (thanks for your work, Jason), I'd prefer to keep the RUN_DEPENDS list short. Those deps are optional and I don't think it makes sense to ask users to install support for all backends supported by duplicity (the list is long). With this in mind, I suggest that archivers/par2cmdline isn't added to RDEPS either. About the LIB_DEPENDS change, the warning: LIB_DEPENDS devel/py-setuptools not needed for sysutils/duplicity ? is due to a quirk in python.port.mk (MODPY_SETUPTOOLS=Yes leads to LIB_DEPENDS containing setuptools). duplicity does ship a .so linked against libpython, thus it makes sense IMO to use MODPY_LIB_DEPENDS. See http://marc.info/?l=openbsd-ports&m=140950775609271&w=2 for more details. This said, 0.6.24 works fine here for my use case (which only involves sftp). If you agree about the above points, this leads to this diff, to be committed when the python.port.mk issue is solved: Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/duplicity/Makefile,v retrieving revision 1.29 diff -u -p -r1.29 Makefile --- Makefile 14 Apr 2014 15:14:28 -0000 1.29 +++ Makefile 31 Aug 2014 14:43:01 -0000 @@ -2,9 +2,8 @@ COMMENT = encrypted backup using rsync algorithm -MODPY_EGG_VERSION = 0.6.23 +MODPY_EGG_VERSION = 0.6.24 DISTNAME = duplicity-${MODPY_EGG_VERSION} -REVISION = 1 CATEGORIES = sysutils @@ -17,6 +16,7 @@ MAINTAINER = Jim Razmus II <jim@openbsd. PERMIT_PACKAGE_CDROM = Yes MODULES = lang/python +MODPY_SETUPTOOLS = Yes WANTLIB += pthread rsync ${MODPY_WANTLIB} @@ -30,7 +30,8 @@ RUN_DEPENDS += net/py-boto \ MAKE_ENV += LIBRSYNC_DIR=${LOCALBASE} -# Tests in ${WRKSRC}/testing directory require bash to run and they all fail +# Some regression tests are hanging +# TEST_DEPENDS = devel/py-mock NO_TEST = Yes # XXX 600 mode prevents from reading the man page; Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/duplicity/distinfo,v retrieving revision 1.15 diff -u -p -r1.15 distinfo --- distinfo 3 Apr 2014 07:59:35 -0000 1.15 +++ distinfo 31 Aug 2014 14:43:01 -0000 @@ -1,2 +1,2 @@ -SHA256 (duplicity-0.6.23.tar.gz) = ehfx4QOV3tzzIEvFOSW7ncu/KnVSybCW6+cn7OucDGA= -SIZE (duplicity-0.6.23.tar.gz) = 1260261 +SHA256 (duplicity-0.6.24.tar.gz) = HUHXVmOPVRBvlQHD25TMvGVoqoVrpTHgftLPt2C2JFA= +SIZE (duplicity-0.6.24.tar.gz) = 1268175 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/sysutils/duplicity/pkg/PLIST,v retrieving revision 1.13 diff -u -p -r1.13 PLIST --- pkg/PLIST 3 Apr 2014 07:59:35 -0000 1.13 +++ pkg/PLIST 31 Aug 2014 14:43:01 -0000 @@ -2,7 +2,11 @@ bin/duplicity bin/rdiffdir lib/python${MODPY_VERSION}/site-packages/duplicity/ -lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info +lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ +lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO +lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt +lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt +lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/duplicity/__init__.py lib/python${MODPY_VERSION}/site-packages/duplicity/__init__.pyc lib/python${MODPY_VERSION}/site-packages/duplicity/_librsync.so @@ -29,8 +33,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/duplicity/backends/botobackend.pyc lib/python${MODPY_VERSION}/site-packages/duplicity/backends/cfbackend.py lib/python${MODPY_VERSION}/site-packages/duplicity/backends/cfbackend.pyc -@comment lib/python${MODPY_VERSION}/site-packages/duplicity/backends/dpbxbackend.py -@comment lib/python${MODPY_VERSION}/site-packages/duplicity/backends/dpbxbackend.pyc +lib/python${MODPY_VERSION}/site-packages/duplicity/backends/dpbxbackend.py +lib/python${MODPY_VERSION}/site-packages/duplicity/backends/dpbxbackend.pyc lib/python${MODPY_VERSION}/site-packages/duplicity/backends/ftpbackend.py lib/python${MODPY_VERSION}/site-packages/duplicity/backends/ftpbackend.pyc lib/python${MODPY_VERSION}/site-packages/duplicity/backends/ftpsbackend.py @@ -55,10 +59,10 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/duplicity/backends/swiftbackend.pyc lib/python${MODPY_VERSION}/site-packages/duplicity/backends/tahoebackend.py lib/python${MODPY_VERSION}/site-packages/duplicity/backends/tahoebackend.pyc -lib/python${MODPY_VERSION}/site-packages/duplicity/backends/u1backend.py -lib/python${MODPY_VERSION}/site-packages/duplicity/backends/u1backend.pyc lib/python${MODPY_VERSION}/site-packages/duplicity/backends/webdavbackend.py lib/python${MODPY_VERSION}/site-packages/duplicity/backends/webdavbackend.pyc +lib/python${MODPY_VERSION}/site-packages/duplicity/backends/~par2wrapperbackend.py +lib/python${MODPY_VERSION}/site-packages/duplicity/backends/~par2wrapperbackend.pyc lib/python${MODPY_VERSION}/site-packages/duplicity/cached_ops.py lib/python${MODPY_VERSION}/site-packages/duplicity/cached_ops.pyc lib/python${MODPY_VERSION}/site-packages/duplicity/collections.py @@ -95,8 +99,6 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/duplicity/log.pyc lib/python${MODPY_VERSION}/site-packages/duplicity/manifest.py lib/python${MODPY_VERSION}/site-packages/duplicity/manifest.pyc -lib/python${MODPY_VERSION}/site-packages/duplicity/misc.py -lib/python${MODPY_VERSION}/site-packages/duplicity/misc.pyc lib/python${MODPY_VERSION}/site-packages/duplicity/patchdir.py lib/python${MODPY_VERSION}/site-packages/duplicity/patchdir.pyc lib/python${MODPY_VERSION}/site-packages/duplicity/path.py -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
