aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml13
-rw-r--r--netlib/http_auth.py1
-rw-r--r--requirements.txt5
-rw-r--r--setup.py2
-rw-r--r--test/requirements.txt5
5 files changed, 17 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 7e4209c0..653f0d8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,19 @@ python:
- "2.7"
# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
install:
- - "pip install coveralls --use-mirrors"
- - "pip install nose-cov --use-mirrors"
- "pip install -r requirements.txt --use-mirrors"
+ - "pip install ."
- "pip install --upgrade git+https://github.com/mitmproxy/pathod.git"
+ - "pip install -r test/requirements.txt --use-mirrors"
# command to run tests, e.g. python setup.py test
script:
- "nosetests --with-cov --cov-report term-missing"
after_success:
- - coveralls \ No newline at end of file
+ - coveralls
+notifications:
+ irc:
+ channels:
+ - "irc.oftc.net#mitmproxy"
+ on_success: change
+ on_failure: always
+
diff --git a/netlib/http_auth.py b/netlib/http_auth.py
index 8f062826..be99fb3d 100644
--- a/netlib/http_auth.py
+++ b/netlib/http_auth.py
@@ -1,4 +1,3 @@
-import binascii
import contrib.md5crypt as md5crypt
import http
from argparse import Action, ArgumentTypeError
diff --git a/requirements.txt b/requirements.txt
index 3b530817..460a60e4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,2 @@
pyasn1>=0.1.7
-pyOpenSSL>=0.13
-nose>=1.3.0
-mock>=1.0.1
-pathod>=0.9.2
+pyOpenSSL>=0.13 \ No newline at end of file
diff --git a/setup.py b/setup.py
index db7adc0b..2937487c 100644
--- a/setup.py
+++ b/setup.py
@@ -74,7 +74,7 @@ setup(
long_description = long_description,
author = "Aldo Cortesi",
author_email = "aldo@corte.si",
- url = "http://cortesi.github.com/netlib",
+ url = "http://github.com/mitmproxy/netlib",
packages = packages,
package_data = package_data,
classifiers = [
diff --git a/test/requirements.txt b/test/requirements.txt
new file mode 100644
index 00000000..89e4aa0a
--- /dev/null
+++ b/test/requirements.txt
@@ -0,0 +1,5 @@
+mock>=1.0.1
+nose>=1.3.0
+nose-cov>=1.6
+coveralls>=0.4.1
+pathod>=0.10 \ No newline at end of file