From 5650eba84822c1bbc9e68cde8339ad4d1a634006 Mon Sep 17 00:00:00 2001
From: "James R. Barlow" <jim@purplerock.ca>
Date: Wed, 10 Oct 2018 23:53:08 -0700
Subject: [PATCH] Cleanup MANIFEST.in, reorg requirements/*.txt, fix
 non-Unicode readme

---
 .docker/Dockerfile                             |  2 +-
 .travis.yml                                    |  4 ++--
 MANIFEST.in                                    | 18 ++++++------------
 docs/installation.rst                          |  2 +-
 dev_requirements.txt => requirements/dev.txt   |  0
 requirements.txt => requirements/main.txt      |  0
 test_requirements.txt => requirements/text.txt |  0
 setup.py                                       |  4 ++--
 8 files changed, 12 insertions(+), 18 deletions(-)
 rename dev_requirements.txt => requirements/dev.txt (100%)
 rename requirements.txt => requirements/main.txt (100%)
 rename test_requirements.txt => requirements/text.txt (100%)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 9f614507..ebb63ddd 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -51,7 +51,7 @@ RUN . /appenv/bin/activate; \
 # Do this now to make the best use of Docker cache.
 COPY . /application
 RUN . /appenv/bin/activate; \
-  pip install -r /application/test_requirements.txt
+  pip install -r /application/requirements/test.txt
 
 # Remove the junk, including the source version of application since it was
 # already installed
diff --git a/.travis.yml b/.travis.yml
index 36c75f4a..750df22f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,9 +91,9 @@ before_install: |
 install:
 - export PATH=$PWD/bin:$PATH
 - pip3 install pycparser  # py3.7 workaround for https://github.com/eliben/pycparser/issues/251
-- pip3 install -r requirements.txt
+- pip3 install -r requirements/main.txt
 - pip3 install --no-deps .
-- pip3 install -r test_requirements.txt
+- pip3 install -r requirements/test.txt
 
 script:
 - tesseract --version
diff --git a/MANIFEST.in b/MANIFEST.in
index 618dfb34..2021f662 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,5 @@
 # requirements
-include requirements.txt
-include test_requirements.txt
-include dev_requirements.txt
+recursive-include requirements *
 
 # git
 include .git_archival.txt
@@ -12,21 +10,20 @@ recursive-include .docker *
 
 # tests
 include .coveragerc
+recursive-include tests *.bin
 recursive-include tests *.jpg
+recursive-include tests *.jsonl
 recursive-include tests *.png
 recursive-include tests *.pdf
 recursive-include tests *.py
 recursive-include tests *.rst
 recursive-include tests *.txt
-recursive-include tests/cache *
-recursive-exclude tests/output *
-recursive-exclude tests/output_pageinfo *
 recursive-exclude tests/resources/private *
 
 # documentation
 include LICENSE
 include *.rst
-recursive-exclude .github * 
+recursive-exclude .github *
 recursive-include docs *.py
 recursive-include docs *.rst
 recursive-include docs *.svg
@@ -42,8 +39,5 @@ exclude .travis*
 
 
 # code
-recursive-include src/ocrmypdf *.py
-exclude ocrmypdf/lib/_leptonica.py
-
-
-
+exclude src/ocrmypdf/lib/_leptonica.py
+exclude scratch.py
diff --git a/docs/installation.rst b/docs/installation.rst
index f9a2802f..bdfb7cbe 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -536,6 +536,6 @@ To install all of the development and test requirements:
     source venv/bin/activate
     cd OCRmyPDF
     pip install -e .
-    pip install -r dev_requirements.txt -r test_requirements.txt
+    pip install -r requirements/dev.txt -r requirements/test.txt
 
 To add JBIG2 encoding, see :ref:`jbig2`.
diff --git a/dev_requirements.txt b/requirements/dev.txt
similarity index 100%
rename from dev_requirements.txt
rename to requirements/dev.txt
diff --git a/requirements.txt b/requirements/main.txt
similarity index 100%
rename from requirements.txt
rename to requirements/main.txt
diff --git a/test_requirements.txt b/requirements/text.txt
similarity index 100%
rename from test_requirements.txt
rename to requirements/text.txt
diff --git a/setup.py b/setup.py
index 27122284..2838dc9b 100644
--- a/setup.py
+++ b/setup.py
@@ -201,11 +201,11 @@ if 'upload' in sys.argv[1:]:
     print('Use twine to upload the package - setup.py upload is insecure')
     sys.exit(1)
 
-tests_require = open('test_requirements.txt').read().splitlines()
+tests_require = open('requirements/test.txt', encoding='utf-8').read().splitlines()
 
 
 def readme():
-    with open('README.md') as f:
+    with open('README.md', encoding='utf-8') as f:
         return f.read()
 
 setup(