Revert "Try moving leptonica build script, playing with wheels a bit"

This reverts commit ec2c6c312b.
2016-02-16 05:04:20 -08:00
parent ec2c6c312b
commit 8cd84afac8
3 changed files with 2 additions and 6 deletions
@@ -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:
@@ -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',