From 35b1ca2be2d63b09c34946b6f209c9c92fcadfee Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Tue, 16 Feb 2016 05:36:14 -0800 Subject: [PATCH] Travis: try replacing non-standard invocation of py.test It seems the normal thing to wire up python setup.py test to invoke the test suite rather than py.test. This may be the reason for the past chain of cffi-related commits. --- .travis.yml | 3 +-- setup.cfg | 4 +++- setup.py | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e700cea..9d4f492d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,8 +40,7 @@ install: script: - python setup.py clean - python setup.py install - - python ocrmypdf/lib/compile_leptonica.py - - py.test -s tests/test_main.py::test_deskew + - python setup.py test os: - linux diff --git a/setup.cfg b/setup.cfg index e57b2572..71efa7b4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,4 +1,6 @@ [bdist_wheel] python-tag = py34 [pytest] -norecursedirs = lib \ No newline at end of file +norecursedirs = lib +[aliases] +test=pytest \ No newline at end of file diff --git a/setup.py b/setup.py index 49d7fb26..a9972b02 100644 --- a/setup.py +++ b/setup.py @@ -209,7 +209,8 @@ setup( ], setup_requires=[ 'setuptools_scm', - 'cffi>=1.0.0' + 'cffi>=1.5.0', + 'pytest-runner' ], use_scm_version={'version_scheme': 'post-release'}, cffi_modules=[