summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2012-05-23 19:20:10 +0200
committerFlorent Xicluna <florent.xicluna@gmail.com>2012-05-23 19:20:10 +0200
commit62ca6e5bbf67af65ea29f2ba4b282dbda040bb90 (patch)
tree170f2cc0fb28a04a9a81f1ab9ed84cfcb92120dd
parentd64d7b5ddbb5d587558d7a0a3c67a8327cb0150f (diff)
parent6ec77492a6af3b5e3f233f536ab943b6e4f2e8e2 (diff)
downloadpep8-62ca6e5bbf67af65ea29f2ba4b282dbda040bb90.tar.gz
Merge remote-tracking branch 'origin/master'
-rw-r--r--.gitignore1
-rw-r--r--.travis.yml11
-rw-r--r--tox.ini13
3 files changed, 25 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 0428e70..63724ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
pep8.egg-info
*.pyc
+.tox
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..d7d21e8
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,11 @@
+language: python
+python:
+ - 2.5
+ - 2.6
+ - 2.7
+ - 3.2
+ - pypy
+script:
+ - python pep8.py --testsuite testsuite
+ - python pep8.py --repeat --statistics pep8.py
+ - python pep8.py --doctest
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..1a67bf2
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,13 @@
+# Tox (http://codespeak.net/~hpk/tox/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py26, py27, py32, pypy, jython
+
+[testenv]
+commands =
+ {envpython} pep8.py --testsuite testsuite
+ {envpython} pep8.py --repeat --statistics pep8.py
+ {envpython} pep8.py --doctest