Merge remote-tracking branch 'origin/master' into feature/replace_tracer_jaeger

Author: avara1986

.travis.yml

@@ -6,6 +6,8 @@ install:
   - pip install -U tox coveralls
 
 script:
+  - pipenv install --dev
+  - pipenv run pip freeze > requirements-tests.txt
   - coverage erase
   - tox
 after_success:

tox.ini

@@ -16,6 +16,10 @@ whitelist_externals = /bin/bash
 
 [testenv:py36]
 basepython = python3.6
-setenv=
-    LC_ALL=en_GB.UTF-8
-    LANG=en_GB.UTF-8
+deps = -rrequirements-tests.txt
+[testenv:py35]
+basepython = python3.5
+deps = -rrequirements-tests.txt
+[testenv:py27]
+basepython = python2.7
+deps = -rrequirements-tests.txt