Skip to content

Commit

Permalink
travis: On Python3 use python3-version of pep8 gevent#38
Browse files Browse the repository at this point in the history
Previously pep8 and pyflakes were installed using the default system Python.
This changes 'make travis' to use the current Python version for those scripts as well.
This affects pep8, at least: on Python3 it complains about space in `print (...)`.
  • Loading branch information
denik committed Dec 23, 2013
1 parent 05aff43 commit c412d47
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
language: python
env:
- PYTHONVER=2.6
- PYTHONVER=2.7
- PYTHONVER=3.3
python:
- "2.6"
- "2.7"
- "3.3"
matrix:
allow_failures:
- env: PYTHONVER=3.3
script: sudo -E make travis
- python: "3.3"
script: make travis
notifications:
email: false
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is renamed to "Makefile.ext" in release tarballs so that setup.py won't try to
# run it. If you want setup.py to run "make" automatically, rename it back to "Makefile".

PYTHON ?= python${PYTHONVER}
PYTHON ?= python${TRAVIS_PYTHON_VERSION}
CYTHON ?= cython

all: gevent/gevent.core.c gevent/gevent.ares.c gevent/gevent._semaphore.c gevent/gevent._util.c
Expand Down Expand Up @@ -37,10 +37,10 @@ whitespace:
! find . -not -path "./.git/*" -not -path "./build/*" -not -path "./libev/*" -not -path "./c-ares/*" -not -path "./doc/_build/*" -type f | xargs egrep -l " $$"

pep8:
pep8 .
${PYTHON} `which pep8` .

pyflakes:
util/pyflakes.py
${PYTHON} util/pyflakes.py

lint: whitespace pep8 pyflakes

Expand All @@ -62,10 +62,10 @@ travis:
make whitespace

pip install -q pep8
make pep8
PYTHON=python make pep8

pip install -q pyflakes
make pyflakes
PYTHON=python make pyflakes

sudo add-apt-repository -y ppa:chris-lea/cython
sudo apt-get -qq -y update
Expand All @@ -77,11 +77,11 @@ travis:

ack -w subprocess greentest/ -l -v | python -c 'import sys; print "\n".join(line.split("/")[-1].strip() for line in sys.stdin)' > greentest/tests_that_dont_use_subprocess.txt

make travistest
sudo -E make travistest

apt-get install ${PYTHON}-dbg
sudo -E apt-get install ${PYTHON}-dbg

PYTHON=${PYTHON}-dbg GEVENTSETUP_EV_VERIFY=3 make travistest
sudo -E PYTHON=${PYTHON}-dbg GEVENTSETUP_EV_VERIFY=3 make travistest


.PHONY: clean all doc pep8 whitespace pyflakes lint travistest travis

0 comments on commit c412d47

Please sign in to comment.