Merge branch 'python3-only'

Closes #841
rst2pdf · Jun 15, 2020 · 56005c9 · 56005c9
2 parents 9947b5e + 785a231
commit 56005c9
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 32 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,7 @@ language: python
 python:
   - 3.6
   - 3.7
+  - 3.8
 
 before_install:
   - pip install --upgrade setuptools

diff --git a/README.rst b/README.rst
@@ -56,11 +56,13 @@ __ https://rst2pdf.org/static/manual.pdf
 Installation
 ------------
 
+*rst2pdf* supports Python 3.6 or greater. Version 0.97 was the last version to support Python 2.7.
+
 Install from PyPI
 ~~~~~~~~~~~~~~~~~
 
 The latest released version may be installed from PyPI by using
-``pip``. It supports Python 2.7 or 3.6+::
+``pip``.
 
     $ pip install --user rst2pdf
 
@@ -75,11 +77,11 @@ then you can install from there with::
 Install from GitHub
 ~~~~~~~~~~~~~~~~~~~
 
-Work on rst2pdf has restarted on GitHub, with the goals of supporting
-Python 3, addressing outstanding issues, and not breaking anything. You
+Work on rst2pdf has restarted on GitHub, with the goals of adding new
+features, addressing outstanding issues, and not breaking anything. You
 can clone the repository and install this version::
 
-    $ git clone https://github.com/rst2pdf/rst2pdf rst2pdf
+    $ git clone https://github.com/rst2pdf/rst2pdf
     $ cd rst2pdf
     $ git checkout <desired-branch> # if you want something other than master
     $ pip install --user .

diff --git a/doc/DEVELOPERS.rst b/doc/DEVELOPERS.rst
@@ -123,7 +123,7 @@ First run
 To run the tests for the first time, you will need to do some setup (after
 this, you can just work on your given virtualenv each time)::
 
-    virtualenv --python=/usr/local/bin/python2 env
+    python -m venv env
     . env/bin/activate
 
     pip install pytest pytest-xdist

diff --git a/requirements.txt b/requirements.txt
@@ -2,43 +2,46 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --upgrade requirements.in
+#    pip-compile requirements.in
 #
 aafigure==0.6
 alabaster==0.7.12         # via sphinx
-babel==2.7.0              # via sphinx
-backports.functools-lru-cache==1.5  # via matplotlib
-certifi==2019.3.9         # via requests
+babel==2.8.0              # via sphinx
+certifi==2019.11.28       # via requests
 chardet==3.0.4            # via requests
+cssselect2==0.2.2         # via svglib
 cycler==0.10.0            # via matplotlib
-docutils==0.14
+docutils==0.16
 html5lib==1.0.1           # via xhtml2pdf
 idna==2.8                 # via requests
-imagesize==1.1.0          # via sphinx
-jinja2==2.10.1            # via sphinx
+imagesize==1.2.0          # via sphinx
+jinja2==2.10.3            # via sphinx
 kiwisolver==1.1.0         # via matplotlib
+lxml==4.4.2               # via svglib
 markupsafe==1.1.1         # via jinja2
-matplotlib==2.2.4
-numpy==1.16.4             # via matplotlib
-packaging==19.0           # via sphinx
+matplotlib==3.1.2
+numpy==1.18.1             # via matplotlib
+packaging==20.0           # via sphinx
 pdfrw==0.4
-pillow==6.2.2             # via reportlab, xhtml2pdf
-pygments==2.4.2
-pyparsing==2.4.0          # via matplotlib, packaging
+pillow==7.0.0             # via reportlab, xhtml2pdf
+pygments==2.5.2
+pyparsing==2.4.6          # via matplotlib, packaging
 pypdf2==1.26.0
-python-dateutil==2.8.0    # via matplotlib
-pytz==2019.1              # via babel, matplotlib
-reportlab==3.5.23
+python-dateutil==2.8.1    # via matplotlib
+pytz==2019.3              # via babel
+reportlab==3.5.34
 requests==2.22.0          # via sphinx
-six==1.12.0
+six==1.14.0
 smartypants==2.0.1
-snowballstemmer==1.2.1    # via sphinx
+snowballstemmer==2.0.0    # via sphinx
 sphinx==1.8.5
 sphinxcontrib-websupport==1.1.2  # via sphinx
-subprocess32==3.5.4       # via matplotlib
 svg2rlg==0.3
 svglib==0.9.3
-typing==3.6.6             # via sphinx
-urllib3==1.25.3           # via requests
-webencodings==0.5.1       # via html5lib
-xhtml2pdf==0.2.3
+tinycss2==1.0.2           # via cssselect2, svglib
+urllib3==1.25.7           # via requests
+webencodings==0.5.1       # via html5lib, tinycss2
+xhtml2pdf==0.2.4
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools
diff --git a/rst2pdf/tests/input/sphinx-repeat-table-rows/index.rst b/rst2pdf/tests/input/sphinx-repeat-table-rows/index.rst
@@ -6,7 +6,7 @@ This table spans two pages. As the ``pdf_repeat_table_rows`` setting in
 2.
 
 .. table::
-   :widths:: 20 80
+   :widths: 20 80
 
    +-----------------------------+----------------------------------------------------------------------------------------------------------------------------+
    |           Column 1          |                                                          Column 2                                                          |

diff --git a/rst2pdf/tests/reference/sphinx-repeat-table-rows.pdf b/rst2pdf/tests/reference/sphinx-repeat-table-rows.pdf
diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@ def read(*rnames):
 setup(
     name='rst2pdf',
     version='0.98',
-    python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*',
+    python_requires='>=3.6',
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
     package_dir={'': '.'},
     package_data={
@@ -53,8 +53,6 @@ def read(*rnames):
         'Environment :: Console',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',