Merge remote-tracking branch 'origin/master'

2013-02-03 11:53:13 -08:00 · 2013-02-03 11:53:13 -08:00 · 0d38f3f1f2
parent 0c56e2a40b 235050a67c
commit 0d38f3f1f2
3 changed files with 9 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,7 @@
 *.pyc
 build/
 dist/
+.tox/
 paramiko.egg-info/
 test.log
 docs/
--- a/requirements.txt
+++ b/requirements.txt
@ -0,0 +1,2 @@
+pycrypto
+tox
--- a/tox.ini
+++ b/tox.ini
@ -0,0 +1,6 @@
+[tox]
+envlist = py25,py26,py27
+
+[testenv]
+commands = pip install --use-mirrors -q -r requirements.txt
+           python test.py