summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTarek Ziade <tarek@ziade.org>2017-04-19 20:59:06 +0200
committerTarek Ziade <tarek@ziade.org>2017-04-19 20:59:06 +0200
commit82ac44a2039db974e1311f844dfd70593795648e (patch)
tree591c17cba115d9a40c555355eb09b2ba8ed0dc14
parentf61b9cbf4f0f1eee785b7f740032438bcaa4799f (diff)
parent03900992dab10742bdd6b296a3a216ade0298561 (diff)
Merge branch 'philipsd6-master'
-rw-r--r--chaussette/server.py4
-rw-r--r--tox.ini2
2 files changed, 5 insertions, 1 deletions
diff --git a/chaussette/server.py b/chaussette/server.py
index 450e2af..c33c90f 100644
--- a/chaussette/server.py
+++ b/chaussette/server.py
@@ -157,6 +157,10 @@ def main():
help="log output")
args = parser.parse_args()
+ if args.python_path is not None:
+ for path in args.python_path.split(os.pathsep):
+ sys.path.append(path)
+
if is_gevent_backend(args.backend) and not args.no_monkey:
from gevent import monkey
monkey.noisy = False
diff --git a/tox.ini b/tox.ini
index a2cf77e..9c7fca5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -40,7 +40,7 @@ commands =
nosetests --randomize -x --with-coverage --cover-package=chaussette chaussette/tests
-coverage combine
coverage html
- coveralls
+ -coveralls
[testenv:py35]
deps =