ping.
note: it depends on previous diff for www/py-genshi${MODPY_FLAVOR}
On Thu, Oct 19, 2017 at 09:39:40AM +0200, Sebastien Marie wrote:
> Hi,
>
> Simple diff to allow py-relatorio to be used on python3.
>
> Some remarks:
> - pycha (and py-yaml) are extra dependencies, and pycha isn't
> available for python3. So I let it in RUN_DEPENDS only for !python3
> (testsuite still passes for python and python3).
>
> - I also added py-libmagic to RUN_DEPENDS as it is required for some
> opendocument processing. Also the testsuite is failing if run
> without.
>
> Thanks.
> --
> Sebastien Marie
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/print/py-relatorio/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile 9 Oct 2017 15:51:26 -0000 1.7
> +++ Makefile 19 Oct 2017 07:37:37 -0000
> @@ -5,6 +5,7 @@ COMMENT= templating library able to out
> MODPY_EGG_VERSION= 0.7.1
> DISTNAME= relatorio-${MODPY_EGG_VERSION}
> PKGNAME= py-${DISTNAME}
> +REVISION= 0
>
> CATEGORIES= print textproc
>
> @@ -19,12 +20,20 @@ MODULES= lang/python
>
> MODPY_SETUPTOOLS= Yes
>
> -RUN_DEPENDS= www/py-genshi \
> - graphics/pycha \
> - textproc/py-yaml \
> - textproc/py-lxml
> +FLAVOR?=
> +FLAVORS= python3
> +
> +RUN_DEPENDS= www/py-genshi${MODPY_FLAVOR} \
> + textproc/py-lxml${MODPY_FLAVOR} \
> + devel/py-libmagic${MODPY_FLAVOR}
> +
> +.if !${FLAVOR:Mpython3}
> +RUN_DEPENDS+= graphics/pycha \
> + textproc/py-yaml
> +.endif
>
> TEST_DEPENDS= ${RUN_DEPENDS} \
> - devel/py-nose
> + devel/py-nose${MODPY_FLAVOR}
> +
>
> .include <bsd.port.mk>
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/print/py-relatorio/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 9 Oct 2017 15:51:26 -0000 1.3
> +++ pkg/PLIST 19 Oct 2017 07:37:37 -0000
> @@ -7,23 +7,28 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/relatorio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
>
> lib/python${MODPY_VERSION}/site-packages/relatorio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> lib/python${MODPY_VERSION}/site-packages/relatorio/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/relatorio/__init__.pyc
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/relatorio/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/relatorio/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/relatorio/${MODPY_PYCACHE}reporting.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/relatorio/reporting.py
> -lib/python${MODPY_VERSION}/site-packages/relatorio/reporting.pyc
> lib/python${MODPY_VERSION}/site-packages/relatorio/templates/
> lib/python${MODPY_VERSION}/site-packages/relatorio/templates/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/relatorio/templates/__init__.pyc
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}chart.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}opendocument.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}pdf.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/relatorio/templates/base.py
> -lib/python${MODPY_VERSION}/site-packages/relatorio/templates/base.pyc
> lib/python${MODPY_VERSION}/site-packages/relatorio/templates/chart.py
> -lib/python${MODPY_VERSION}/site-packages/relatorio/templates/chart.pyc
> lib/python${MODPY_VERSION}/site-packages/relatorio/templates/opendocument.py
> -lib/python${MODPY_VERSION}/site-packages/relatorio/templates/opendocument.pyc
> lib/python${MODPY_VERSION}/site-packages/relatorio/templates/pdf.py
> -lib/python${MODPY_VERSION}/site-packages/relatorio/templates/pdf.pyc
> lib/python${MODPY_VERSION}/site-packages/relatorio/tests/
> lib/python${MODPY_VERSION}/site-packages/relatorio/tests/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/relatorio/tests/__init__.pyc
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/relatorio/tests/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/relatorio/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/relatorio/tests/${MODPY_PYCACHE}test_api.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/relatorio/tests/${MODPY_PYCACHE}test_odt.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/relatorio/tests/egg.jpg
> lib/python${MODPY_VERSION}/site-packages/relatorio/tests/one.jpg
> lib/python${MODPY_VERSION}/site-packages/relatorio/tests/templates/
> @@ -34,7 +39,5 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/relatorio/tests/test.fodt
> lib/python${MODPY_VERSION}/site-packages/relatorio/tests/test.odt
> lib/python${MODPY_VERSION}/site-packages/relatorio/tests/test_api.py
> -lib/python${MODPY_VERSION}/site-packages/relatorio/tests/test_api.pyc
> lib/python${MODPY_VERSION}/site-packages/relatorio/tests/test_odt.py
> -lib/python${MODPY_VERSION}/site-packages/relatorio/tests/test_odt.pyc
> lib/python${MODPY_VERSION}/site-packages/relatorio/tests/two.png
--
Sebastien Marie
