Skip to content

Commit

Permalink
unbreak the Jenkins build (again/hopefully)
Browse files Browse the repository at this point in the history
Pyflakes is unavailable in the Jenkins Python 3 / PyPy environments
  • Loading branch information
slingamn committed May 8, 2012
1 parent 6fd03d5 commit 2ee6744
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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

Expand Down

0 comments on commit 2ee6744

Please sign in to comment.