Merge branch 'prepare-0.95.1' into stable/0.95

Closes #957
rst2pdf · Dec 30, 2020 · 945736c · 945736c
2 parents 7d2416a + b8d190d
commit 945736c
Show file tree

Hide file tree

Showing 23 changed files with 54 additions and 34 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,29 @@
+name: Python package
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.5, 3.6, 3.7, 3.8]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get -y install plantuml inkscape texlive-latex-base dvipng
+        python -m pip install --upgrade pip
+        pip install --upgrade setuptools
+        pip install nose coverage
+        pip install -c requirements.txt -e .[tests,sphinx,svgsupport,aafiguresupport,mathsupport,rawhtmlsupport]
+    - name: Test
+      run: |
+        nosetests -i regulartest -i sphinxtest
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,6 +2,12 @@
 {next}
 ------
 
+0.95.1 (2020-12-30)
+-------------------
+
+* Added: Explicitly support Python 3.5 so that pip installs this rather than 0.93
+  which does not work on any Python 3.x. (Issue #955)
+
 
 0.95 (2019-12-30)
 -----------------

diff --git a/doc/manual.rst b/doc/manual.rst
@@ -4,7 +4,7 @@ How to use rst2pdf
 
 .. meta::
   :authors: rst2pdf project <https://rst2pdf.org>; Roberto Alsina <ralsina@netmanagers.com.ar>;
-  :version: 0.95.dev
+  :version: 0.95.1
   :revision: 2019011700
 
 .. header::

diff --git a/rst2pdf/extensions/inkscape_r2p.py b/rst2pdf/extensions/inkscape_r2p.py
@@ -57,8 +57,8 @@ def __init__(self, filename, width=None, height=None, kind='direct',
                 # Inkscape 0.x uses -A
                 cmd = [progname, os.path.abspath(filename), '-A', pdffname]
             else:
-                # Inkscape 1.x uses --export-file
-                cmd = [progname, os.path.abspath(filename), '--export-file=%s' % pdffname]
+                # Inkscape 1.x uses --export-filename
+                cmd = [progname, os.path.abspath(filename), '--export-filename=%s' % pdffname]
             try:
                 result = subprocess.call(cmd)
                 if result != 0:
@@ -89,8 +89,8 @@ def raster(self, filename, client):
                 # Inkscape 0.x uses -A
                 cmd = [progname, os.path.abspath(filename), '-e', pngfname, '-d', str(client.def_dpi)]
             else:
-                # Inkscape 1.x uses --export-file
-                cmd = [progname, os.path.abspath(filename), '--export-file=%s' % pngfname, '-d', str(client.def_dpi)]
+                # Inkscape 1.x uses --export-filename
+                cmd = [progname, os.path.abspath(filename), '--export-filename=%s' % pngfname, '-d', str(client.def_dpi)]
             try:
                 subprocess.call(cmd)
                 return pngfname

diff --git a/rst2pdf/tests/input/test_fancytitles.ignore b/rst2pdf/tests/input/test_fancytitles.ignore
diff --git a/rst2pdf/tests/input/test_foreground.ignore b/rst2pdf/tests/input/test_foreground.ignore
diff --git a/rst2pdf/tests/input/test_image_units_pdf.ignore b/rst2pdf/tests/input/test_image_units_pdf.ignore
diff --git a/rst2pdf/tests/input/test_issue_263.ignore b/rst2pdf/tests/input/test_issue_263.ignore
diff --git a/rst2pdf/tests/input/test_issue_265.ignore b/rst2pdf/tests/input/test_issue_265.ignore
diff --git a/rst2pdf/tests/input/test_issue_265_2.ignore b/rst2pdf/tests/input/test_issue_265_2.ignore
diff --git a/rst2pdf/tests/input/test_issue_266_3.ignore b/rst2pdf/tests/input/test_issue_266_3.ignore
diff --git a/rst2pdf/tests/input/test_issue_266_4.ignore b/rst2pdf/tests/input/test_issue_266_4.ignore
diff --git a/rst2pdf/tests/input/test_issue_267.ignore b/rst2pdf/tests/input/test_issue_267.ignore
diff --git a/rst2pdf/tests/input/test_vectorpdf.ignore b/rst2pdf/tests/input/test_vectorpdf.ignore
diff --git a/rst2pdf/tests/md5/test_fancytitles.json b/rst2pdf/tests/md5/test_fancytitles.json
@@ -6,9 +6,11 @@ bad_md5 = [
 
 good_md5 = [
         '3ddba1b9358cf7972e8eb0d52372bac2',
+        '45c001d44f1a48db071f7a93972521e1',
         '509284277dc15228b629388249f6453a',
         '51c298c6af218900a0abb3066b08823c',
         '5386e164e5a952f88980a1089cf92fee',
+        '5bf460501e12be067b9b7d72b17dc09c',
         '651349f0143b26986707ef8a374a4d2b',
         '6645b78157c295d50dad176d8e31324e',
         '73165f457eba4d815ae058cea34b652b',

diff --git a/rst2pdf/tests/md5/test_issue_231.json b/rst2pdf/tests/md5/test_issue_231.json
@@ -11,6 +11,7 @@ good_md5 = [
         '02d182fd3f0681c2d6407bc28595d388',
         '1598edb5f46c2a2f263a6f6eef9f8347',
         '24e3d2b8088713c824986a31865a8909',
+        '38cb2c4366427561830a1dd7d9fb7e7b',
         '6216a091cf744aed49f21484816b725e',
         'b5cec31528deb328b4fe279fb19474bd',
         'sentinel'

diff --git a/rst2pdf/tests/md5/test_issue_294.json b/rst2pdf/tests/md5/test_issue_294.json
@@ -10,6 +10,7 @@ good_md5 = [
         '68644cda0746ced903907b6402313fb4',
         '6f4ad9fb9d65cf6e1b70ecde3d6cd7b0',
         '775e3ca7a907131ae30d3736e3441f95',
+        '80eb89f8ae43fc3601db31d0b41caf53',
         'f3af9f42a0722e58f9eae27148171bb1',
         'sentinel'
 ]

diff --git a/rst2pdf/tests/md5/test_issue_311.json b/rst2pdf/tests/md5/test_issue_311.json
@@ -8,6 +8,7 @@ good_md5 = [
         '25df926ca3c272c9dd6c0f44d3732d75',
         '3584f078f7dc8cee8891ae076d654ffe',
         '4b9ed29aa5f75cc7fab775eb813b1dea',
+        '494d89c6ab2dbc4d7680a74ac4e0c6bb',
         '4c305a8981095dd4b0b6f913232e6c2f',
         '50a5ae0f9ed172cc9773e809749fb2bc',
         '5baa91c9a16fc5de6e034fc7f7fa7107',

diff --git a/rst2pdf/tests/md5/test_issue_383.json b/rst2pdf/tests/md5/test_issue_383.json
@@ -6,6 +6,7 @@ good_md5 = [
         '13aabe3a15c94120e5b7e3dfe50bb3b1',
         '4c0cdd5d439922ff1fbf2ff64f8efe14',
         '7c83eb3cb2817fd34b0f6c6184ebca78',
+        '8500324005c53ecd91e2a7c13121298c',
         'df2128b6559013de2f0cc4924091c11b',
         'sentinel'
 ]

diff --git a/rst2pdf/tests/md5/test_issue_468.json b/rst2pdf/tests/md5/test_issue_468.json
@@ -8,6 +8,7 @@ good_md5 = [
         '613c82dcfba152913471f798d55f0e9b',
         '7944dd3554acbce866d75af8ec5e8df8',
         '825c4ddeb3594b42b80a859f5ab6f8ba',
+        '8f8d519138fd81f6e2ed553a4cc93bc1',
         'sentinel'
 ]
 
diff --git a/rst2pdf/tests/md5/test_slides.json b/rst2pdf/tests/md5/test_slides.json
@@ -8,6 +8,8 @@ good_md5 = [
         '0b6bb07229e261aab26734c15bca5dca',
         '11caf5494e4c8430e791512c2d8407de',
         '225a7b3ba0c1160487e51ab7f092e2f7',
+        '38fa44c721e6042003ad1a0352297691',
+        '377d9eb5bed22daecbd32985b1ec7fab',
         '429a9e46b5626d857aac4727223f9a7b',
         '468859c6356396a0a62447b77ba41826',
         '5432990d8c87443d90967acf4f41d27c',

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 from setuptools import find_packages, setup
 
-version = '0.95'
+version = '0.95.1'
 
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
@@ -39,7 +39,7 @@ def read(*rnames):
 setup(
     name="rst2pdf",
     version=version,
-    python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*',
+    python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
     package_data=dict(rst2pdf=['styles/*.json',
 	'styles/*.style',
@@ -70,9 +70,10 @@ def read(*rnames):
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
-	'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
-	'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Topic :: Documentation',
         'Topic :: Software Development :: Libraries :: Python Modules',