Merge branch 'master' into pyup-update-pytest-3.1.0-to-3.1.1

.travis.yml

@@ -1,3 +1,4 @@
+dist: trusty
 language: python
 python:
 - 2.7
@@ -96,9 +97,8 @@ notifications:
       - "https://silne30-foxpuppet.getbadges.io/api/app/webhook/b71ddba7-6feb-412c-8728-3efef552d02b"
     on_start: "change"
 before_script:
-  - export GECKODRIVER_DOWNLOAD=`curl -s 'https://api.github.com/repos/mozilla/geckodriver/releases/latest' | python -c "import sys, json; r = json.load(sys.stdin); print([a for a in r['assets'] if 'linux64' in a['name']][0]['browser_download_url']);"`
-  - curl -L -o geckodriver.tar.gz $GECKODRIVER_DOWNLOAD
-  - mkdir $HOME/geckodriver && tar xvf geckodriver.tar.gz -C $HOME/geckodriver
+  - wget -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/v0.16.1/geckodriver-v0.16.1-linux64.tar.gz
+  - mkdir $HOME/geckodriver && tar xvf /tmp/geckodriver.tar.gz -C $HOME/geckodriver
   - export PATH=$HOME/geckodriver:$PATH
   - firefox --version
   - geckodriver --version

tox.ini

@@ -2,6 +2,7 @@
 envlist = py{27,36}, flake8
 
 [testenv]
+recreate = True
 passenv = DISPLAY TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 deps = -rrequirements/coverage.txt
 commands =