Merge pull request #779 from akrabat/update-dependencies

Update dependencies

CHANGES.rst

@@ -2,6 +2,8 @@
 {next}
 ------
 
+* Changed: Update tested dependencies to include ReportLab 3.5.23 (Issue #779)
+* Fixed: Internal links work when using ReportLab 3.5.19+ (Issue #772)
 * Add support for units in spaceBefore/spaceAfter for stylesheets (Issue #754)
 * Remove support for Psyco (Issue #756)
 * Remove support for PythonMagick, GFX and SWFTools (Issue #756)

requirements.in

@@ -7,6 +7,6 @@ pyPdf2
 reportlab
 six
 smartypants
-sphinx<1.80
+sphinx<1.8.0
 svglib
 xhtml2pdf

requirements.txt

@@ -2,13 +2,13 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --upgrade-package urllib3 requirements.in
+#    pip-compile --upgrade requirements.in
 #
 aafigure==0.6
 alabaster==0.7.12         # via sphinx
-babel==2.6.0              # via sphinx
+babel==2.7.0              # via sphinx
 backports.functools-lru-cache==1.5  # via matplotlib
-certifi==2018.11.29       # via requests
+certifi==2019.3.9         # via requests
 chardet==3.0.4            # via requests
 cssselect2==0.2.1         # via svglib
 cycler==0.10.0            # via matplotlib
@@ -17,30 +17,30 @@ html5lib==1.0.1           # via xhtml2pdf
 idna==2.8                 # via requests
 imagesize==1.1.0          # via sphinx
 jinja2==2.10.1            # via sphinx
-kiwisolver==1.0.1         # via matplotlib
-lxml==4.3.1               # via svglib
-markupsafe==1.1.0         # via jinja2
-matplotlib==2.2.3
-numpy==1.15.4             # via matplotlib
-packaging==18.0           # via sphinx
+kiwisolver==1.1.0         # via matplotlib
+lxml==4.3.3               # via svglib
+markupsafe==1.1.1         # via jinja2
+matplotlib==2.2.4
+numpy==1.16.4             # via matplotlib
+packaging==19.0           # via sphinx
 pdfrw==0.4
-pillow==5.3.0             # via reportlab, xhtml2pdf
-pygments==2.3.0
-pyparsing==2.3.0          # via matplotlib, packaging
+pillow==6.0.0             # via reportlab, xhtml2pdf
+pygments==2.4.2
+pyparsing==2.4.0          # via matplotlib, packaging
 pypdf2==1.26.0
-python-dateutil==2.7.5    # via matplotlib
-pytz==2018.7              # via babel, matplotlib
-reportlab==3.5.12
-requests==2.21.0          # via sphinx
+python-dateutil==2.8.0    # via matplotlib
+pytz==2019.1              # via babel, matplotlib
+reportlab==3.5.23
+requests==2.22.0          # via sphinx
 six==1.12.0
 smartypants==2.0.1
 snowballstemmer==1.2.1    # via sphinx
 sphinx==1.7.9
-sphinxcontrib-websupport==1.1.0  # via sphinx
-subprocess32==3.5.3       # via matplotlib
+sphinxcontrib-websupport==1.1.2  # via sphinx
+subprocess32==3.5.4       # via matplotlib
 svglib==0.9.0
 tinycss2==0.6.1           # via cssselect2, svglib
 typing==3.6.6             # via sphinx
-urllib3==1.24.3
+urllib3==1.25.3           # via requests
 webencodings==0.5.1       # via html5lib, tinycss2
 xhtml2pdf==0.2.3

rst2pdf/flowables.py

@@ -1013,7 +1013,7 @@ def wrap(self, availWidth, availHeight):
                 leftColStyle = self.levelStyles[left_col_level]
             label = self.refid_lut.get((level, text, pageNum), None)
             if label:
-                pre = u'<a href="%s" color="%s">' % (label, self.linkColor)
+                pre = u'<a href="#%s" color="%s">' % (label, self.linkColor)
                 post = u'</a>'
                 if isinstance(text, bytes):
                     text = text.decode('utf-8')

rst2pdf/genelements.py

@@ -822,7 +822,7 @@ def gather_elements(self, client, node, style):
                 client.targets.append(ltext)
         elif len(node['backrefs'])==1 and client.footnote_backlinks:
             if ltext not in client.targets:
-                label = Paragraph(ids+'<a href="%s" color="%s">%s</a>' % (
+                label = Paragraph(ids+'<a href="#%s" color="%s">%s</a>' % (
                                     node['backrefs'][0],
                                     client.styles.linkColor,
                                     ltext), client.styles["endnote"])

rst2pdf/tests/md5/test_issue_349.json

@@ -3,6 +3,7 @@ bad_md5 = [
 ]
 
 good_md5 = [
+        '5461062fff25f0b61bf49a1048b10d95',
         'b2141868279a6b17d4e7bc979064974f',
         'd7f01c316bb37b874c1ce09a1e901707',
         'f37b21ede17dd3c5634b51dcb01d75af',