From 2ee67441c849ad5f1944a6758f81e26172dc05c0 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Mon, 7 May 2012 22:36:51 -0700 Subject: [PATCH] unbreak the Jenkins build (again/hopefully) Pyflakes is unavailable in the Jenkins Python 3 / PyPy environments --- Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9439b67..8fb6b82 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,13 @@ PYFLAKES_WHITELIST=$(shell find . -name "*.py" ! -path "./docs/*" ! -path "./tes ! -path "./requests/packages/*" ! -path "./env/*" \ ! -path "./requests/__init__.py" ! -path "./requests/compat.py") +# hack: if pyflakes is available, set this to the location of pyflakes +# if it's not, e.g., in the Python 3 or PyPy Jenkins environments, set it to +# the location of the no-op `true` command. +PYFLAKES_IF_AVAILABLE=$(shell if which pyflakes > /dev/null ; \ + then which pyflakes; \ + else which true; fi ) + # test_requests_ext.py depends on external services, and async doesn't work under Python 3 # Travis/Jenkins should be ensuring that all other tests pass on all supported versions CI_TESTS=$(shell find tests/ -name "*.py" ! -name "test_requests_ext.py" ! -name "test_requests_async.py") @@ -26,10 +33,13 @@ simple: pyflakes: pyflakes ${PYFLAKES_WHITELIST} +cipyflakes: + ${PYFLAKES_IF_AVAILABLE} ${PYFLAKES_WHITELIST} + citests: nosetests ${CI_TESTS} --with-xunit --xunit-file=junit-report.xml -ci: citests pyflakes +ci: citests cipyflakes travis: citests -- 2.34.1