On Sat, Apr 23, 2016 at 12:23:19PM -0400, Michael Reed wrote:
> On 04/17/16 16:55, Michael Reed wrote:
> > On 04/17/16 16:50, Michael Reed wrote:
> > > Release notes:
> > > https://github.com/borgbackup/borg/blob/1.0.2/docs/changes.rst
> > >
> > >
> > > In addition to just the update, this patch also:
> > >
> > > - enables the py-test-benchmark portion of the tests
> > > - removes a patch, made unnecessary due to the recent py-sphinx update
> > >
> > > (thanks to Alexander Shadchin for both of those changes)
> >
> > Also if someone knows how to accomplish the test target in a less hacky
> > way then please let me know.
> >
>
> Any comments?
>
> All the tests pass for me, and I've been using this since the date of
> the original post with no issues.
>
Some rework. OK ?
--
Alexandr Shadchin
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/borgbackup/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 10 Apr 2016 18:58:16 -0000 1.3
+++ Makefile 28 Apr 2016 15:04:36 -0000
@@ -2,7 +2,7 @@
COMMENT = deduplicating backup program
-MODPY_EGG_VERSION = 1.0.1
+MODPY_EGG_VERSION = 1.0.2
DISTNAME = borgbackup-${MODPY_EGG_VERSION}
MODPY_PI = Yes
@@ -21,28 +21,27 @@ WANTLIB += ${MODPY_WANTLIB} crypto pthr
LIB_DEPENDS = ${MODPY_LIB_DEPENDS} archivers/lz4
BUILD_DEPENDS += devel/py-setuptools_scm${MODPY_FLAVOR} \
- textproc/py-sphinx
+ textproc/py-sphinx${MODPY_FLAVOR}
RUN_DEPENDS += net/py-msgpack${MODPY_FLAVOR}
-TEST_DEPENDS += net/py-msgpack${MODPY_FLAVOR} \
+TEST_DEPENDS += ${RUN_DEPENDS} \
devel/py-test${MODPY_FLAVOR} \
- devel/py-virtualenv${MODPY_FLAVOR}
+ devel/py-test-benchmark${MODPY_FLAVOR}
MODPY_SETUPTOOLS = Yes
post-build:
- make -C ${WRKSRC}/docs man READTHEDOCS=True
+ ${MODPY_CMD} build_ext --inplace
+ cd ${WRKSRC}/docs; env PYTHONPATH=${WRKSRC} \
+ make man SPHINXBUILD=sphinx-build${MODPY_BIN_SUFFIX}
post-install:
${INSTALL_MAN} ${WRKSRC}/docs/_build/man/borg.1
${PREFIX}/man/man1/borg.1
-do-test:
- (cd ${WRKSRC} ;\
- virtualenv${MODPY_BIN_SUFFIX} --system-site-packages --no-pip
borg-env ;\
- . borg-env/bin/activate ;\
- ./borg-env/bin/python${MODPY_DEFAULT_VERSION_3} ./setup.py
install ;\
- cd build/lib.openbsd-$$(uname -r)-$$(uname
-m)-${MODPY_DEFAULT_VERSION_3} ;\
- export PYTHONPATH=`pwd` ;\
- py.test${MODPY_BIN_SUFFIX} -k 'not benchmark' --pyargs
borg.testsuite)
+do-test: fake
+ cd ${WRKSRC}; \
+ PATH=${WRKINST}/usr/local/bin:${PATH} \
+ PYTHONPATH=${WRKSRC} \
+ ${MODPY_BIN} -m pytest --ignore lib*
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/borgbackup/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 10 Apr 2016 18:58:16 -0000 1.2
+++ distinfo 28 Apr 2016 15:04:36 -0000
@@ -1,2 +1,2 @@
-SHA256 (borgbackup-1.0.1.tar.gz) = WKLC5kkgfI4VIj9jgNI4EksPG0X9g5kKQN9bZ4zUH7o=
-SIZE (borgbackup-1.0.1.tar.gz) = 413316
+SHA256 (borgbackup-1.0.2.tar.gz) = Eeo0MpD3iKLYSfQ+uwfo8JkPZR888JfKT0zZzi8I39c=
+SIZE (borgbackup-1.0.2.tar.gz) = 422181
Index: patches/patch-docs_conf_py
===================================================================
RCS file: patches/patch-docs_conf_py
diff -N patches/patch-docs_conf_py
--- patches/patch-docs_conf_py 8 Apr 2016 21:15:04 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-docs_conf_py,v 1.1.1.1 2016/04/08 21:15:04 giovanni Exp $
---- docs/conf.py.orig Tue Apr 5 23:09:41 2016
-+++ docs/conf.py Tue Apr 5 23:10:48 2016
-@@ -44,7 +44,7 @@ master_doc = 'index'
-
- # General information about the project.
- project = 'Borg - Deduplicating Archiver'
--copyright = '2010-2014 Jonas Borgström, 2015-2016 The Borg Collective (see
AUTHORS file)'
-+copyright = u'2010-2014 Jonas Borgström, 2015-2016 The Borg Collective (see
AUTHORS file)'
-
- # The version info for the project you're documenting, acts as replacement for
- # |version| and |release|, also used in various other places throughout the
