Skip to content

Commit

Permalink
Update requirements files and documentation for Python 3.6 - no code …
Browse files Browse the repository at this point in the history
…changes
  • Loading branch information
James R. Barlow committed Jan 3, 2017
1 parent cc9ceae commit 5ec38a4
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 11 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ cache:
- tests/cache

python:
- 3.4
- 3.5
- "3.4"
- "3.5"
- "3.6-dev" # 3.6 not available yet

before_cache:
- rm -f $HOME/.cache/pip/log/debug.log
Expand Down
13 changes: 9 additions & 4 deletions dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
check-manifest>=0.33
setuptools-scm>=1.11.1
twine>=1.8.1
coverage>=4.2
check-manifest >= 0.34
twine >= 1.8.1
coverage >= 4.3.1
pytest-xdist >= 1.15.0

# Known good versions: 1.11.1
# Known broken versions: 1.15.0
setuptools-scm == 1.11.1
setuptools-scm-git-archive == 1.0
4 changes: 4 additions & 0 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ In this worked example, the current working directory contains an input file cal
docker run --rm -v "$(pwd):/home/docker" ocrmypdf --skip-text test.pdf output.pdf
.. note:: The working directory should be a writable local volume or Docker may not have permission to access it.

Note that ``ocrmypdf`` has its own separate ``-v VERBOSITYLEVEL`` argument to control debug verbosity. All Docker arguments should before the ``ocrmypdf`` image name and all arguments to ``ocrmypdf`` should be listed after.


Expand Down Expand Up @@ -105,6 +107,8 @@ Install or upgrade the required Homebrew packages, if any are missing:
brew install libxml2 libffi leptonica
brew install unpaper # optional
Python 3.4, 3.5 and 3.6 are supported.

Install the required Tesseract OCR engine with the language packs you plan to use:

.. code-block:: bash
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# setup.py lists a separate set of requirements that are looser to simplify
# installation
ruffus==2.6.3
Pillow==3.3.0
reportlab==3.2.0
Pillow==4.0.0
reportlab==3.3.0
PyPDF2==1.26
img2pdf==0.2.1
cffi==1.5.2
cffi==1.9.1
6 changes: 5 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,9 @@ def check_external_program(
keywords=['PDF', 'OCR', 'optical character recognition', 'PDF/A', 'scanning'],
classifiers=[
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Development Status :: 5 - Production/Stable",
"Environment :: Console",
"Intended Audience :: End Users/Desktop",
Expand All @@ -211,7 +214,8 @@ def check_external_program(
"Topic :: Text Processing :: Linguistic",
],
setup_requires=[
'setuptools_scm',
'setuptools-scm',
'setuptools-scm-git-archive',
'cffi>=1.5.0',
'pytest-runner'
],
Expand Down
2 changes: 1 addition & 1 deletion test_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pytest>=2.7.2
pytest >= 2.7.2

0 comments on commit 5ec38a4

Please sign in to comment.