py-rst2pdf: updated to 0.98

0.98

Added: We can now create coverage reports using tox -e coverage.
Changed: Update Pygments styles
Changed: Update Pillow dependency in requirements.txt.
Changed: Use content-based comparison in tests.
Fixed: Elements with that that don't have an rst2pdf element (e.g. subtitles, inline references) no longer cause a crash,
Fixed: SVGlib is really optional now!
Fixed: The README, LICENSE and CHANGES files are now packaged with the release tarball.
Removed: Support for pdfrw has been removed and hence support for rendering SVGs using Inkscape has also been removed.

5 files changed, 60 insertions, 74 deletions

diff --git a/textproc/py-rst2pdf/Makefile b/textproc/py-rst2pdf/Makefile
index 2123bbba709..5fe6357d52d 100644
--- a/textproc/py-rst2pdf/Makefile
+++ b/textproc/py-rst2pdf/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2020/08/31 23:07:06 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2020/10/21 06:58:09 adam Exp $
 
-DISTNAME=	rst2pdf-0.97
+DISTNAME=	rst2pdf-0.98
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc python
 MASTER_SITES=	${MASTER_SITE_PYPI:=r/rst2pdf/}
@@ -11,22 +11,21 @@ COMMENT=	Convert restructured text to PDF via reportlab
 LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
+DEPENDS+=	${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata
 DEPENDS+=	${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
-DEPENDS+=	${PYPKGPREFIX}-pdfrw-[0-9]*:../../textproc/py-pdfrw
+DEPENDS+=	${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
 DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 DEPENDS+=	${PYPKGPREFIX}-reportlab-[0-9]*:../../print/py-reportlab
-DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-smartypants-[0-9]*:../../textproc/py-smartypants
 TEST_DEPENDS+=	${PYPKGPREFIX}-PDF2-[0-9]*:../../print/py-PDF2
 
-PYTHON_VERSIONED_DEPENDENCIES+=	setuptools
-
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
 	${MV} rst2pdf rst2pdf-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-rst2pdf/PLIST b/textproc/py-rst2pdf/PLIST
index 02765c0649d..90ea2dc0a2f 100644
--- a/textproc/py-rst2pdf/PLIST
+++ b/textproc/py-rst2pdf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2020/06/11 10:30:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/10/21 06:58:09 adam Exp $
 bin/rst2pdf-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -9,24 +9,30 @@ ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/rst2pdf/__init__.py
 ${PYSITELIB}/rst2pdf/__init__.pyc
 ${PYSITELIB}/rst2pdf/__init__.pyo
-${PYSITELIB}/rst2pdf/aafigure_directive.py
-${PYSITELIB}/rst2pdf/aafigure_directive.pyc
-${PYSITELIB}/rst2pdf/aafigure_directive.pyo
 ${PYSITELIB}/rst2pdf/basenodehandler.py
 ${PYSITELIB}/rst2pdf/basenodehandler.pyc
 ${PYSITELIB}/rst2pdf/basenodehandler.pyo
 ${PYSITELIB}/rst2pdf/config.py
 ${PYSITELIB}/rst2pdf/config.pyc
 ${PYSITELIB}/rst2pdf/config.pyo
-${PYSITELIB}/rst2pdf/counter_off_role.py
-${PYSITELIB}/rst2pdf/counter_off_role.pyc
-${PYSITELIB}/rst2pdf/counter_off_role.pyo
-${PYSITELIB}/rst2pdf/counter_role.py
-${PYSITELIB}/rst2pdf/counter_role.pyc
-${PYSITELIB}/rst2pdf/counter_role.pyo
 ${PYSITELIB}/rst2pdf/createpdf.py
 ${PYSITELIB}/rst2pdf/createpdf.pyc
 ${PYSITELIB}/rst2pdf/createpdf.pyo
+${PYSITELIB}/rst2pdf/directives/__init__.py
+${PYSITELIB}/rst2pdf/directives/__init__.pyc
+${PYSITELIB}/rst2pdf/directives/__init__.pyo
+${PYSITELIB}/rst2pdf/directives/aafigure.py
+${PYSITELIB}/rst2pdf/directives/aafigure.pyc
+${PYSITELIB}/rst2pdf/directives/aafigure.pyo
+${PYSITELIB}/rst2pdf/directives/code_block.py
+${PYSITELIB}/rst2pdf/directives/code_block.pyc
+${PYSITELIB}/rst2pdf/directives/code_block.pyo
+${PYSITELIB}/rst2pdf/directives/noop.py
+${PYSITELIB}/rst2pdf/directives/noop.pyc
+${PYSITELIB}/rst2pdf/directives/noop.pyo
+${PYSITELIB}/rst2pdf/directives/oddeven.py
+${PYSITELIB}/rst2pdf/directives/oddeven.pyc
+${PYSITELIB}/rst2pdf/directives/oddeven.pyo
 ${PYSITELIB}/rst2pdf/dumpstyle.py
 ${PYSITELIB}/rst2pdf/dumpstyle.pyc
 ${PYSITELIB}/rst2pdf/dumpstyle.pyo
@@ -39,21 +45,15 @@ ${PYSITELIB}/rst2pdf/extensions/dotted_toc.pyo
 ${PYSITELIB}/rst2pdf/extensions/fancytitles.py
 ${PYSITELIB}/rst2pdf/extensions/fancytitles.pyc
 ${PYSITELIB}/rst2pdf/extensions/fancytitles.pyo
-${PYSITELIB}/rst2pdf/extensions/inkscape_r2p.py
-${PYSITELIB}/rst2pdf/extensions/inkscape_r2p.pyc
-${PYSITELIB}/rst2pdf/extensions/inkscape_r2p.pyo
-${PYSITELIB}/rst2pdf/extensions/plantuml.py
-${PYSITELIB}/rst2pdf/extensions/plantuml.pyc
-${PYSITELIB}/rst2pdf/extensions/plantuml.pyo
+${PYSITELIB}/rst2pdf/extensions/plantuml_r2p.py
+${PYSITELIB}/rst2pdf/extensions/plantuml_r2p.pyc
+${PYSITELIB}/rst2pdf/extensions/plantuml_r2p.pyo
 ${PYSITELIB}/rst2pdf/extensions/preprocess_r2p.py
 ${PYSITELIB}/rst2pdf/extensions/preprocess_r2p.pyc
 ${PYSITELIB}/rst2pdf/extensions/preprocess_r2p.pyo
 ${PYSITELIB}/rst2pdf/extensions/sample.py
 ${PYSITELIB}/rst2pdf/extensions/sample.pyc
 ${PYSITELIB}/rst2pdf/extensions/sample.pyo
-${PYSITELIB}/rst2pdf/extensions/vectorpdf_r2p.py
-${PYSITELIB}/rst2pdf/extensions/vectorpdf_r2p.pyc
-${PYSITELIB}/rst2pdf/extensions/vectorpdf_r2p.pyo
 ${PYSITELIB}/rst2pdf/findfonts.py
 ${PYSITELIB}/rst2pdf/findfonts.pyc
 ${PYSITELIB}/rst2pdf/findfonts.pyo
@@ -83,24 +83,24 @@ ${PYSITELIB}/rst2pdf/math_flowable.pyo
 ${PYSITELIB}/rst2pdf/nodehandlers.py
 ${PYSITELIB}/rst2pdf/nodehandlers.pyc
 ${PYSITELIB}/rst2pdf/nodehandlers.pyo
-${PYSITELIB}/rst2pdf/noop_directive.py
-${PYSITELIB}/rst2pdf/noop_directive.pyc
-${PYSITELIB}/rst2pdf/noop_directive.pyo
-${PYSITELIB}/rst2pdf/oddeven_directive.py
-${PYSITELIB}/rst2pdf/oddeven_directive.pyc
-${PYSITELIB}/rst2pdf/oddeven_directive.pyo
-${PYSITELIB}/rst2pdf/opt_imports.py
-${PYSITELIB}/rst2pdf/opt_imports.pyc
-${PYSITELIB}/rst2pdf/opt_imports.pyo
 ${PYSITELIB}/rst2pdf/pdfbuilder.py
 ${PYSITELIB}/rst2pdf/pdfbuilder.pyc
 ${PYSITELIB}/rst2pdf/pdfbuilder.pyo
 ${PYSITELIB}/rst2pdf/pygments2style.py
 ${PYSITELIB}/rst2pdf/pygments2style.pyc
 ${PYSITELIB}/rst2pdf/pygments2style.pyo
-${PYSITELIB}/rst2pdf/pygments_code_block_directive.py
-${PYSITELIB}/rst2pdf/pygments_code_block_directive.pyc
-${PYSITELIB}/rst2pdf/pygments_code_block_directive.pyo
+${PYSITELIB}/rst2pdf/roles/__init__.py
+${PYSITELIB}/rst2pdf/roles/__init__.pyc
+${PYSITELIB}/rst2pdf/roles/__init__.pyo
+${PYSITELIB}/rst2pdf/roles/counter.py
+${PYSITELIB}/rst2pdf/roles/counter.pyc
+${PYSITELIB}/rst2pdf/roles/counter.pyo
+${PYSITELIB}/rst2pdf/roles/counter_off.py
+${PYSITELIB}/rst2pdf/roles/counter_off.pyc
+${PYSITELIB}/rst2pdf/roles/counter_off.pyo
+${PYSITELIB}/rst2pdf/roles/package.py
+${PYSITELIB}/rst2pdf/roles/package.pyc
+${PYSITELIB}/rst2pdf/roles/package.pyo
 ${PYSITELIB}/rst2pdf/rson.py
 ${PYSITELIB}/rst2pdf/rson.pyc
 ${PYSITELIB}/rst2pdf/rson.pyo
@@ -130,6 +130,10 @@ ${PYSITELIB}/rst2pdf/styles/a5-landscape.style
 ${PYSITELIB}/rst2pdf/styles/a5.style
 ${PYSITELIB}/rst2pdf/styles/a6-landscape.style
 ${PYSITELIB}/rst2pdf/styles/a6.style
+${PYSITELIB}/rst2pdf/styles/abap.style
+${PYSITELIB}/rst2pdf/styles/algol.style
+${PYSITELIB}/rst2pdf/styles/algol_nu.style
+${PYSITELIB}/rst2pdf/styles/arduino.style
 ${PYSITELIB}/rst2pdf/styles/autumn.style
 ${PYSITELIB}/rst2pdf/styles/b0.style
 ${PYSITELIB}/rst2pdf/styles/b1-landscape.style
@@ -157,26 +161,40 @@ ${PYSITELIB}/rst2pdf/styles/freetype-sans.style
 ${PYSITELIB}/rst2pdf/styles/freetype-serif.style
 ${PYSITELIB}/rst2pdf/styles/friendly.style
 ${PYSITELIB}/rst2pdf/styles/fruity.style
+${PYSITELIB}/rst2pdf/styles/igor.style
 ${PYSITELIB}/rst2pdf/styles/kerning.style
 ${PYSITELIB}/rst2pdf/styles/legal.style
 ${PYSITELIB}/rst2pdf/styles/letter-landscape.style
 ${PYSITELIB}/rst2pdf/styles/letter.style
+${PYSITELIB}/rst2pdf/styles/lovelace.style
 ${PYSITELIB}/rst2pdf/styles/manni.style
 ${PYSITELIB}/rst2pdf/styles/monokai.style
 ${PYSITELIB}/rst2pdf/styles/murphy.style
 ${PYSITELIB}/rst2pdf/styles/native.style
 ${PYSITELIB}/rst2pdf/styles/no-compact-lists.style
+${PYSITELIB}/rst2pdf/styles/paraiso-dark.style
+${PYSITELIB}/rst2pdf/styles/paraiso-light.style
 ${PYSITELIB}/rst2pdf/styles/pastie.style
 ${PYSITELIB}/rst2pdf/styles/perldoc.style
+${PYSITELIB}/rst2pdf/styles/rainbow_dash.style
+${PYSITELIB}/rst2pdf/styles/rrt.style
+${PYSITELIB}/rst2pdf/styles/sas.style
 ${PYSITELIB}/rst2pdf/styles/serif.style
+${PYSITELIB}/rst2pdf/styles/solarized-dark.style
+${PYSITELIB}/rst2pdf/styles/solarized-light.style
 ${PYSITELIB}/rst2pdf/styles/sphinx.style
+${PYSITELIB}/rst2pdf/styles/stata-dark.style
+${PYSITELIB}/rst2pdf/styles/stata-light.style
+${PYSITELIB}/rst2pdf/styles/stata.style
 ${PYSITELIB}/rst2pdf/styles/styles.style
 ${PYSITELIB}/rst2pdf/styles/tango.style
 ${PYSITELIB}/rst2pdf/styles/tenpoint.style
 ${PYSITELIB}/rst2pdf/styles/trac.style
 ${PYSITELIB}/rst2pdf/styles/twelvepoint.style
 ${PYSITELIB}/rst2pdf/styles/twocolumn.style
+${PYSITELIB}/rst2pdf/styles/vim.style
 ${PYSITELIB}/rst2pdf/styles/vs.style
+${PYSITELIB}/rst2pdf/styles/xcode.style
 ${PYSITELIB}/rst2pdf/svgimage.py
 ${PYSITELIB}/rst2pdf/svgimage.pyc
 ${PYSITELIB}/rst2pdf/svgimage.pyo
diff --git a/textproc/py-rst2pdf/distinfo b/textproc/py-rst2pdf/distinfo
index 3f4c708d4d6..be1736e84eb 100644
--- a/textproc/py-rst2pdf/distinfo
+++ b/textproc/py-rst2pdf/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.5 2020/06/11 10:30:41 adam Exp $
+$NetBSD: distinfo,v 1.6 2020/10/21 06:58:09 adam Exp $
 
-SHA1 (rst2pdf-0.97.tar.gz) = 75da7c01e6e82971a60b77c73cd395004b9caef1
-RMD160 (rst2pdf-0.97.tar.gz) = d97cfc611c59060fbb0db91b55d9dacf11ad7fa9
-SHA512 (rst2pdf-0.97.tar.gz) = cb5c219895791e68bd025f00adc00babb30d2b37e0e48ad69e05c264e96d7e0ec9f272fa87f9d0fccc0160f737b374e35add6eb650fe7e59333149ba413fa193
-Size (rst2pdf-0.97.tar.gz) = 140033 bytes
-SHA1 (patch-rst2pdf_createpdf.py) = dae3e14b3e35f5cc8bf3292ec5dc4cd13724447c
-SHA1 (patch-rst2pdf_flowables.py) = 13c639110fd34bcecfc6a79f0c1c6002af301201
+SHA1 (rst2pdf-0.98.tar.gz) = 87fcc70ee33ec11e759649c86e41a9df81438f99
+RMD160 (rst2pdf-0.98.tar.gz) = ffcf967ba3ccc7cb1241a7c2a8ff58be14298175
+SHA512 (rst2pdf-0.98.tar.gz) = f8fcc269139e1d163fc21a5f92262c1e106b98c8807d45f3b53f9e9164fa667e3508bfe7ca7fd100e7f60e4105980c15dedfe546f0a81d1cc02b3a24b8dd7e48
+Size (rst2pdf-0.98.tar.gz) = 11333895 bytes
diff --git a/textproc/py-rst2pdf/patches/patch-rst2pdf_createpdf.py b/textproc/py-rst2pdf/patches/patch-rst2pdf_createpdf.py
deleted file mode 100644
index 026a516cf00..00000000000
--- a/textproc/py-rst2pdf/patches/patch-rst2pdf_createpdf.py
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-rst2pdf_createpdf.py,v 1.1 2019/05/08 10:20:16 adam Exp $
-
-Add missing import.
-
---- rst2pdf/createpdf.py.orig	2019-05-08 10:08:54.000000000 +0000
-+++ rst2pdf/createpdf.py
-@@ -76,6 +76,7 @@ try:
- except ImportError:
-     from docutils.utils.roman import toRoman
- 
-+import reportlab
- from reportlab.platypus import *
- from reportlab.platypus.doctemplate import IndexingFlowable
- from reportlab.platypus.flowables import _listWrapOn, _Container
diff --git a/textproc/py-rst2pdf/patches/patch-rst2pdf_flowables.py b/textproc/py-rst2pdf/patches/patch-rst2pdf_flowables.py
deleted file mode 100644
index 4fa3cd508e3..00000000000
--- a/textproc/py-rst2pdf/patches/patch-rst2pdf_flowables.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-rst2pdf_flowables.py,v 1.1 2019/05/08 10:20:16 adam Exp $
-
-Add missing import.
-
---- rst2pdf/flowables.py.orig	2019-05-08 09:52:12.000000000 +0000
-+++ rst2pdf/flowables.py
-@@ -12,7 +12,7 @@ import re
- from reportlab.platypus import *
- from reportlab.platypus.doctemplate import *
- from reportlab.lib.enums import *
--
-+import reportlab
- 
- from reportlab.lib.units import *
- from reportlab.lib.enums import TA_LEFT, TA_CENTER, TA_RIGHT