Re: [update] vdirsyncer 0.16.3

2017-10-11 Thread Remi Locherer 
On Wed, Oct 11, 2017 at 03:00:59AM +0200, Jeremie Courreges-Anglas wrote:
> On Tue, Oct 10 2017, Remi Locherer  wrote:
> > On Mon, Oct 09, 2017 at 03:02:49PM -0400, Daniel Jakots wrote:
> >> On Sat, 7 Oct 2017 23:21:31 +0200, Remi Locherer
> >>  wrote:
> >> 
> >> > Hi,
> >> > 
> >> > this is an update for vdirsyncer to version 0.16.3 which was released
> >> > few days ago. See
> >> > https://vdirsyncer.pimutils.org/en/stable/changelog.html for changes.
> >> > 
> >> > This patch also enables tests and shortens some long lines in
> >> > Makefile.
> >> 
> >> lgtm
> >> 
> >> > The tests depend on two python modules that are not available in ports
> >> > yet. py-test-localserver
> >> 
> >> it needs requests as a TDEP, can you put MODPY_PI and MODPY_SETUPTOOLS
> >> just after MODULES please?
> >
> > Thanks for spotting this! Attached the fixed ports.
> 
> Looks good to me.  Two nits in py-test-subtesthack:
> - s/an/and in COMMENT
> - the bdep on devel/py-setuptools_scm doesn't seem to be needed?

Right, py-setuptools_scm is not needed. Somehow I thought it is but could
not find any evidence any more ;-)

Attached py-setuptools_scm with the two fixes.

Thanks,
Remi


py-test-subtesthack.tgz
Description: application/tar-gz

Re: [update] vdirsyncer 0.16.3

2017-10-10 Thread Jeremie Courreges-Anglas 
On Tue, Oct 10 2017, Remi Locherer  wrote:
> On Mon, Oct 09, 2017 at 03:02:49PM -0400, Daniel Jakots wrote:
>> On Sat, 7 Oct 2017 23:21:31 +0200, Remi Locherer
>>  wrote:
>> 
>> > Hi,
>> > 
>> > this is an update for vdirsyncer to version 0.16.3 which was released
>> > few days ago. See
>> > https://vdirsyncer.pimutils.org/en/stable/changelog.html for changes.
>> > 
>> > This patch also enables tests and shortens some long lines in
>> > Makefile.
>> 
>> lgtm
>> 
>> > The tests depend on two python modules that are not available in ports
>> > yet. py-test-localserver
>> 
>> it needs requests as a TDEP, can you put MODPY_PI and MODPY_SETUPTOOLS
>> just after MODULES please?
>
> Thanks for spotting this! Attached the fixed ports.

Looks good to me.  Two nits in py-test-subtesthack:
- s/an/and in COMMENT
- the bdep on devel/py-setuptools_scm doesn't seem to be needed?

With this addressed, ok jca@ to import py-test-localserver and
py-test-subtesthack, and ok for the vdirsyncer update.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: [update] vdirsyncer 0.16.3

2017-10-10 Thread Remi Locherer 
On Mon, Oct 09, 2017 at 03:02:49PM -0400, Daniel Jakots wrote:
> On Sat, 7 Oct 2017 23:21:31 +0200, Remi Locherer
>  wrote:
> 
> > Hi,
> > 
> > this is an update for vdirsyncer to version 0.16.3 which was released
> > few days ago. See
> > https://vdirsyncer.pimutils.org/en/stable/changelog.html for changes.
> > 
> > This patch also enables tests and shortens some long lines in
> > Makefile.
> 
> lgtm
> 
> > The tests depend on two python modules that are not available in ports
> > yet. py-test-localserver
> 
> it needs requests as a TDEP, can you put MODPY_PI and MODPY_SETUPTOOLS
> just after MODULES please?

Thanks for spotting this! Attached the fixed ports.

Remi

> 
> > and py-test-subtesthack are attached to this mail.
> 
> same things about Makefile order as above?
> 
> > The author of vdirsyncer announced that the next version will include
> > some rust code. That means in the future this port will only be
> > available on i386 and amd64.
> > 
> > Remi
> > 
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/productivity/vdirsyncer/Makefile,v
> > retrieving revision 1.4
> > diff -u -p -r1.4 Makefile
> > --- Makefile31 Aug 2017 16:30:23 -  1.4
> > +++ Makefile7 Oct 2017 21:16:02 -
> > @@ -2,7 +2,7 @@
> >  
> >  COMMENT =  synchronize calendars and contacts
> >  
> > -MODPY_EGG_VERSION =0.16.2
> > +MODPY_EGG_VERSION =0.16.3
> >  DISTNAME = vdirsyncer-${MODPY_EGG_VERSION}
> >  CATEGORIES =   productivity
> >  
> > @@ -28,19 +28,30 @@ RUN_DEPENDS =
> > devel/py-atomicwrites${MO devel/py-click-threading${MODPY_FLAVOR} \
> > www/py-requests-toolbelt${MODPY_FLAVOR}
> >  
> > +TEST_DEPENDS = devel/py-hypothesis${MODPY_FLAVOR} \
> > +   devel/py-test-localserver${MODPY_FLAVOR} \
> > +   devel/py-test-subtesthack${MODPY_FLAVOR} \
> > +   www/py-urllib3${MODPY_FLAVOR} \
> > +   ${RUN_DEPENDS}
> > +
> >  post-build:
> > cd ${WRKSRC}/docs; ${MAKE_ENV} PYTHONPATH=${WRKSRC} \
> > -   sphinx-build${MODPY_BIN_SUFFIX} -b html -d
> > _build/doctrees . _build/html
> > +   sphinx-build${MODPY_BIN_SUFFIX} \
> > +   -b html -d _build/doctrees . _build/html
> >  
> >  post-install:
> > ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vdirsyncer
> > ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vdirsyncer
> > -   cd ${WRKSRC}; ${INSTALL_DATA} AUTHORS.rst CHANGELOG.rst
> > CONTRIBUTING.rst \
> > -   ISSUE_TEMPLATE.md LICENSE README.rst
> > ${PREFIX}/share/doc/vdirsyncer
> > -   cd ${WRKSRC}/docs/_build/html && pax -rw *
> > ${PREFIX}/share/doc/vdirsyncer
> > +   cd ${WRKSRC}; ${INSTALL_DATA} AUTHORS.rst CHANGELOG.rst \
> > +   CONTRIBUTING.rst ISSUE_TEMPLATE.md LICENSE
> > README.rst \
> > +   ${PREFIX}/share/doc/vdirsyncer
> > +   cd ${WRKSRC}/docs/_build/html && \
> > +   pax -rw * ${PREFIX}/share/doc/vdirsyncer
> > ${INSTALL_DATA} ${WRKSRC}/config.example \
> > ${PREFIX}/share/examples/vdirsyncer
> >  
> > -NO_TEST =  Yes
> > +do-test:
> > +   cd ${WRKSRC}; DAV_SERVER=skip DETERMINISTIC_TESTS=true \
> > +   ${MODPY_BIN} -m pytest tests/
> >  
> >  .include 
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/productivity/vdirsyncer/distinfo,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 distinfo
> > --- distinfo31 Aug 2017 16:30:23 -  1.3
> > +++ distinfo7 Oct 2017 21:16:02 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (vdirsyncer-0.16.2.tar.gz) =
> > qoGfKfS80ffdVqmNzt23GVasiQ2KNEFN+aLe+lj/uKc= -SIZE
> > (vdirsyncer-0.16.2.tar.gz) = 112083 +SHA256
> > (vdirsyncer-0.16.3.tar.gz)
> > = /F9sUiXViLAe4iU1inwJYoOJaiompPAsllHPk6Jb/DY= +SIZE
> > (vdirsyncer-0.16.3.tar.gz) = 113327 Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/productivity/vdirsyncer/pkg/PLIST,v retrieving
> > revision 1.3 diff -u -p -r1.3 PLIST
> > --- pkg/PLIST   31 Aug 2017 16:30:23 -  1.3
> > +++ pkg/PLIST   7 Oct 2017 21:16:02 -
> > @@ -17,7 +17,6 @@ lib/python${MODPY_VERSION}/site-packages
> >  
> > lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
> >  
> > lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}metasync.${MODPY_PYC_MAGIC_TAG}pyc
> >  
> > lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}repair.${MODPY_PYC_MAGIC_TAG}pyc
> > -lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}sync.${MODPY_PYC_MAGIC_TAG}pyc
> >  
> > lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> >  
> > lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
> >

Re: [update] vdirsyncer 0.16.3

2017-10-09 Thread Daniel Jakots 
On Sat, 7 Oct 2017 23:21:31 +0200, Remi Locherer
 wrote:

> Hi,
> 
> this is an update for vdirsyncer to version 0.16.3 which was released
> few days ago. See
> https://vdirsyncer.pimutils.org/en/stable/changelog.html for changes.
> 
> This patch also enables tests and shortens some long lines in
> Makefile.

lgtm

> The tests depend on two python modules that are not available in ports
> yet. py-test-localserver

it needs requests as a TDEP, can you put MODPY_PI and MODPY_SETUPTOOLS
just after MODULES please?

> and py-test-subtesthack are attached to this mail.

same things about Makefile order as above?

> The author of vdirsyncer announced that the next version will include
> some rust code. That means in the future this port will only be
> available on i386 and amd64.
> 
> Remi
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/productivity/vdirsyncer/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile  31 Aug 2017 16:30:23 -  1.4
> +++ Makefile  7 Oct 2017 21:16:02 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =synchronize calendars and contacts
>  
> -MODPY_EGG_VERSION =  0.16.2
> +MODPY_EGG_VERSION =  0.16.3
>  DISTNAME =   vdirsyncer-${MODPY_EGG_VERSION}
>  CATEGORIES = productivity
>  
> @@ -28,19 +28,30 @@ RUN_DEPENDS =
> devel/py-atomicwrites${MO devel/py-click-threading${MODPY_FLAVOR} \
>   www/py-requests-toolbelt${MODPY_FLAVOR}
>  
> +TEST_DEPENDS =   devel/py-hypothesis${MODPY_FLAVOR} \
> + devel/py-test-localserver${MODPY_FLAVOR} \
> + devel/py-test-subtesthack${MODPY_FLAVOR} \
> + www/py-urllib3${MODPY_FLAVOR} \
> + ${RUN_DEPENDS}
> +
>  post-build:
>   cd ${WRKSRC}/docs; ${MAKE_ENV} PYTHONPATH=${WRKSRC} \
> - sphinx-build${MODPY_BIN_SUFFIX} -b html -d
> _build/doctrees . _build/html
> + sphinx-build${MODPY_BIN_SUFFIX} \
> + -b html -d _build/doctrees . _build/html
>  
>  post-install:
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vdirsyncer
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vdirsyncer
> - cd ${WRKSRC}; ${INSTALL_DATA} AUTHORS.rst CHANGELOG.rst
> CONTRIBUTING.rst \
> - ISSUE_TEMPLATE.md LICENSE README.rst
> ${PREFIX}/share/doc/vdirsyncer
> - cd ${WRKSRC}/docs/_build/html && pax -rw *
> ${PREFIX}/share/doc/vdirsyncer
> + cd ${WRKSRC}; ${INSTALL_DATA} AUTHORS.rst CHANGELOG.rst \
> + CONTRIBUTING.rst ISSUE_TEMPLATE.md LICENSE
> README.rst \
> + ${PREFIX}/share/doc/vdirsyncer
> + cd ${WRKSRC}/docs/_build/html && \
> + pax -rw * ${PREFIX}/share/doc/vdirsyncer
>   ${INSTALL_DATA} ${WRKSRC}/config.example \
>   ${PREFIX}/share/examples/vdirsyncer
>  
> -NO_TEST =Yes
> +do-test:
> + cd ${WRKSRC}; DAV_SERVER=skip DETERMINISTIC_TESTS=true \
> + ${MODPY_BIN} -m pytest tests/
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/productivity/vdirsyncer/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo  31 Aug 2017 16:30:23 -  1.3
> +++ distinfo  7 Oct 2017 21:16:02 -
> @@ -1,2 +1,2 @@
> -SHA256 (vdirsyncer-0.16.2.tar.gz) =
> qoGfKfS80ffdVqmNzt23GVasiQ2KNEFN+aLe+lj/uKc= -SIZE
> (vdirsyncer-0.16.2.tar.gz) = 112083 +SHA256
> (vdirsyncer-0.16.3.tar.gz)
> = /F9sUiXViLAe4iU1inwJYoOJaiompPAsllHPk6Jb/DY= +SIZE
> (vdirsyncer-0.16.3.tar.gz) = 113327 Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/productivity/vdirsyncer/pkg/PLIST,v retrieving
> revision 1.3 diff -u -p -r1.3 PLIST
> --- pkg/PLIST 31 Aug 2017 16:30:23 -  1.3
> +++ pkg/PLIST 7 Oct 2017 21:16:02 -
> @@ -17,7 +17,6 @@ lib/python${MODPY_VERSION}/site-packages
>  
> lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}metasync.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}repair.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}sync.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}vobject.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -59,7 +58,14 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/http.py
>  lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/memory.py
>

[update] vdirsyncer 0.16.3

2017-10-07 Thread Remi Locherer 
Hi,

this is an update for vdirsyncer to version 0.16.3 which was released
few days ago. See https://vdirsyncer.pimutils.org/en/stable/changelog.html
for changes.

This patch also enables tests and shortens some long lines in Makefile.

The tests depend on two python modules that are not available in ports
yet. py-test-localserver and py-test-subtesthack are attached to this
mail.

The author of vdirsyncer announced that the next version will include some
rust code. That means in the future this port will only be available on
i386 and amd64.

Remi


Index: Makefile
===
RCS file: /cvs/ports/productivity/vdirsyncer/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile31 Aug 2017 16:30:23 -  1.4
+++ Makefile7 Oct 2017 21:16:02 -
@@ -2,7 +2,7 @@
 
 COMMENT =  synchronize calendars and contacts
 
-MODPY_EGG_VERSION =0.16.2
+MODPY_EGG_VERSION =0.16.3
 DISTNAME = vdirsyncer-${MODPY_EGG_VERSION}
 CATEGORIES =   productivity
 
@@ -28,19 +28,30 @@ RUN_DEPENDS =   devel/py-atomicwrites${MO
devel/py-click-threading${MODPY_FLAVOR} \
www/py-requests-toolbelt${MODPY_FLAVOR}
 
+TEST_DEPENDS = devel/py-hypothesis${MODPY_FLAVOR} \
+   devel/py-test-localserver${MODPY_FLAVOR} \
+   devel/py-test-subtesthack${MODPY_FLAVOR} \
+   www/py-urllib3${MODPY_FLAVOR} \
+   ${RUN_DEPENDS}
+
 post-build:
cd ${WRKSRC}/docs; ${MAKE_ENV} PYTHONPATH=${WRKSRC} \
-   sphinx-build${MODPY_BIN_SUFFIX} -b html -d _build/doctrees . 
_build/html
+   sphinx-build${MODPY_BIN_SUFFIX} \
+   -b html -d _build/doctrees . _build/html
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vdirsyncer
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vdirsyncer
-   cd ${WRKSRC}; ${INSTALL_DATA} AUTHORS.rst CHANGELOG.rst 
CONTRIBUTING.rst \
-   ISSUE_TEMPLATE.md LICENSE README.rst 
${PREFIX}/share/doc/vdirsyncer
-   cd ${WRKSRC}/docs/_build/html && pax -rw * 
${PREFIX}/share/doc/vdirsyncer
+   cd ${WRKSRC}; ${INSTALL_DATA} AUTHORS.rst CHANGELOG.rst \
+   CONTRIBUTING.rst ISSUE_TEMPLATE.md LICENSE README.rst \
+   ${PREFIX}/share/doc/vdirsyncer
+   cd ${WRKSRC}/docs/_build/html && \
+   pax -rw * ${PREFIX}/share/doc/vdirsyncer
${INSTALL_DATA} ${WRKSRC}/config.example \
${PREFIX}/share/examples/vdirsyncer
 
-NO_TEST =  Yes
+do-test:
+   cd ${WRKSRC}; DAV_SERVER=skip DETERMINISTIC_TESTS=true \
+   ${MODPY_BIN} -m pytest tests/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/productivity/vdirsyncer/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo31 Aug 2017 16:30:23 -  1.3
+++ distinfo7 Oct 2017 21:16:02 -
@@ -1,2 +1,2 @@
-SHA256 (vdirsyncer-0.16.2.tar.gz) = 
qoGfKfS80ffdVqmNzt23GVasiQ2KNEFN+aLe+lj/uKc=
-SIZE (vdirsyncer-0.16.2.tar.gz) = 112083
+SHA256 (vdirsyncer-0.16.3.tar.gz) = 
/F9sUiXViLAe4iU1inwJYoOJaiompPAsllHPk6Jb/DY=
+SIZE (vdirsyncer-0.16.3.tar.gz) = 113327
Index: pkg/PLIST
===
RCS file: /cvs/ports/productivity/vdirsyncer/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   31 Aug 2017 16:30:23 -  1.3
+++ pkg/PLIST   7 Oct 2017 21:16:02 -
@@ -17,7 +17,6 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}metasync.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}repair.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}sync.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}vobject.${MODPY_PYC_MAGIC_TAG}pyc
@@ -59,7 +58,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/http.py
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/memory.py
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/singlefile.py
-lib/python${MODPY_VERSION}/site-packages/vdirsyncer/sync.py
+lib/python${MODPY_VERSION}/site-packages/vdirsyncer/sync/
+lib/python${MODPY_VERSION}/site-packages/vdirsyncer/sync/__init__.py
+lib/python${MODPY_VERSION}/site-packages/vdirsyncer/sync/${MODPY_PYCACHE}/