From 8cd84afac8109fa367b6d22aeec14f16a81b5977 Mon Sep 17 00:00:00 2001
From: "James R. Barlow" <jim@purplerock.ca>
Date: Tue, 16 Feb 2016 05:04:20 -0800
Subject: [PATCH] Revert "Try moving leptonica build script, playing with
 wheels a bit"

This reverts commit ec2c6c312bc7e64c25b26563e9093d89ea1b9032.
---
 .travis.yml                             | 6 +-----
 ocrmypdf/{ => lib}/compile_leptonica.py | 0
 setup.py                                | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)
 rename ocrmypdf/{ => lib}/compile_leptonica.py (100%)

diff --git a/.travis.yml b/.travis.yml
index 9717bd74..fb28f247 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,6 @@ before_install:
 
     # pip
     - pip install --upgrade pip
-    - pip install --upgrade wheel
 
     # Download, make and install unpaper (using ccache)
     - mkdir -p tarballs
@@ -34,17 +33,14 @@ before_install:
     - export PATH="/usr/lib/ccache:$PATH"
     - pushd unpaper-6.1 && ./configure --prefix=/usr && make -j && sudo make install && popd
 
-    - pip wheel -r requirements.txt -w $HOME/.cache/pip
-
 install:
     - pip install -r requirements.txt
     - pip install -r test_requirements.txt
 
 script:
     - python setup.py clean
-    - python setup.py build
     - python setup.py install
-    - cat /home/travis/build/jbarlow83/OCRmyPDF/lib/_leptonica.py
+    - cat ./lib/_leptonica.py
     - py.test -s tests/test_main.py::test_deskew
 
 os:
diff --git a/ocrmypdf/compile_leptonica.py b/ocrmypdf/lib/compile_leptonica.py
similarity index 100%
rename from ocrmypdf/compile_leptonica.py
rename to ocrmypdf/lib/compile_leptonica.py
diff --git a/setup.py b/setup.py
index bf42505e..49d7fb26 100644
--- a/setup.py
+++ b/setup.py
@@ -213,7 +213,7 @@ setup(
     ],
     use_scm_version={'version_scheme': 'post-release'},
     cffi_modules=[
-        'ocrmypdf/compile_leptonica.py:ffi'
+        'ocrmypdf/lib/compile_leptonica.py:ffi'
     ],
     install_requires=[
         'ruffus>=2.6.3',