summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2013-02-03 11:53:13 -0800
committerJeff Forcier <jeff@bitprophet.org>2013-02-03 11:53:13 -0800
commit0d38f3f1f266092a2a5e91cae9527acd8bbb72e7 (patch)
treef5faf4f926e571211de5139ee66c282801d4d696
parent0c56e2a40bae88163c9422b1bca5fa6fc4c97640 (diff)
parent235050a67ccf0500b91de10e2f208c0456cbe43c (diff)
Merge remote-tracking branch 'origin/master'
-rw-r--r--.gitignore1
-rw-r--r--requirements.txt2
-rw-r--r--tox.ini6
3 files changed, 9 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5f9c3d74..4b578950 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
*.pyc
build/
dist/
+.tox/
paramiko.egg-info/
test.log
docs/
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..75112a23
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,2 @@
+pycrypto
+tox
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..6cb80012
--- /dev/null
+++ 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