Merge remote-tracking branch 'upstream/master'

CONTRIBUTING.md

@@ -23,7 +23,7 @@ A great way to start contributing to Camelot is to pick an issue tagged with the
 To install the dependencies needed for development, you can use pip:
 
 <pre>
-$ pip install camelot-py[dev]
+$ pip install "camelot-py[dev]"
 </pre>
 
 Alternatively, you can clone the project repository, and install using pip:

HISTORY.md

@@ -4,6 +4,13 @@ Release History
 master
 ------
 
+0.8.1 (2020-07-21)
+------------------
+
+**Bugfixes**
+
+* [#169](https://github.com/camelot-dev/camelot/issues/169) Fix import error caused by `pdfminer.six==20200720`. [#171](https://github.com/camelot-dev/camelot/pull/171) by Vinayak Mehta.
+
 0.8.0 (2020-05-24)
 ------------------
 

README.md

@@ -74,7 +74,7 @@ $ conda install -c conda-forge camelot-py
 After [installing the dependencies](https://camelot-py.readthedocs.io/en/master/user/install-deps.html) ([tk](https://packages.ubuntu.com/bionic/python/python-tk) and [ghostscript](https://www.ghostscript.com/)), you can simply use pip to install Camelot:
 
 <pre>
-$ pip install camelot-py[cv]
+$ pip install "camelot-py[cv]"
 </pre>
 
 ### From the source code
@@ -113,7 +113,7 @@ $ git clone https://www.github.com/camelot-dev/camelot
 You can install the development dependencies easily, using pip:
 
 <pre>
-$ pip install camelot-py[dev]
+$ pip install "camelot-py[dev]"
 </pre>
 
 ### Testing

camelot/__version__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-VERSION = (0, 8, 0)
+VERSION = (0, 8, 1)
 PRERELEASE = None  # alpha, beta or rc
 REVISION = None
 

camelot/utils.py

@@ -14,7 +14,7 @@ import numpy as np
 from pdfminer.pdfparser import PDFParser
 from pdfminer.pdfdocument import PDFDocument
 from pdfminer.pdfpage import PDFPage
-from pdfminer.pdfpage import PDFTextExtractionNotAllowed
+from pdfminer.pdfpage import PDFTextExtractionNotAllowedError
 from pdfminer.pdfinterp import PDFResourceManager
 from pdfminer.pdfinterp import PDFPageInterpreter
 from pdfminer.converter import PDFPageAggregator
@@ -780,7 +780,7 @@ def get_page_layout(
         parser = PDFParser(f)
         document = PDFDocument(parser)
         if not document.is_extractable:
-            raise PDFTextExtractionNotAllowed
+            raise PDFTextExtractionNotAllowedError(f"Text extraction is not allowed: {filename}")
         laparams = LAParams(
             char_margin=char_margin,
             line_margin=line_margin,

docs/dev/contributing.rst

@@ -37,7 +37,7 @@ Setting up a development environment
 
 To install the dependencies needed for development, you can use pip::
 
-    $ pip install camelot-py[dev]
+    $ pip install "camelot-py[dev]"
 
 Alternatively, you can clone the project repository, and install using pip::
 

docs/user/install.rst

@@ -25,7 +25,7 @@ Using pip
 
 After :ref:`installing the dependencies <install_deps>`, which include `Tkinter`_ and `ghostscript`_, you can simply use pip to install Camelot::
 
-    $ pip install camelot-py[cv]
+    $ pip install "camelot-py[cv]"
 
 .. _Tkinter: https://wiki.python.org/moin/TkInter
 .. _ghostscript: https://www.ghostscript.com

requirements.txt

@@ -5,6 +5,6 @@ numpy>=1.13.3
 opencv-python>=3.4.2.17
 openpyxl>=2.5.8
 pandas>=0.23.4
-pdfminer.six>=20170720
+pdfminer.six>=20200720
 PyPDF2>=1.26.0
-Sphinx>=1.7.9
+Sphinx>=3.1.2

setup.py

@@ -19,7 +19,7 @@ requires = [
     'numpy>=1.13.3',
     'openpyxl>=2.5.8',
     'pandas>=0.23.4',
-    'pdfminer.six>=20170720',
+    'pdfminer.six>=20200720',
     'PyPDF2>=1.26.0'
 ]
 
@@ -33,11 +33,11 @@ plot_requires = [
 
 dev_requires = [
     'codecov>=2.0.15',
-    'pytest>=3.8.0',
+    'pytest>=5.4.3',
-    'pytest-cov>=2.6.0',
+    'pytest-cov>=2.10.0',
-    'pytest-mpl>=0.10',
+    'pytest-mpl>=0.11',
-    'pytest-runner>=4.2',
+    'pytest-runner>=5.2',
-    'Sphinx>=1.7.9'
+    'Sphinx>=3.1.2'
 ]
 
 all_requires = cv_requires + plot_requires