Link homebrew python

.travis.yml

@@ -5,57 +5,16 @@ cache:
         - $HOME/.cache/pip
 
 before_install:
-  - '([ $TRAVIS_OS_NAME == linux ] && dpkg -s libaugeas0) || (brew update && brew install augeas python3)'
+  - '([ $TRAVIS_OS_NAME == linux ] && dpkg -s libaugeas0) || (brew update && brew install augeas python3 && brew link python)'
 
 before_script:
-  - 'if [ $TRAVIS_OS_NAME = osx ] ; then ulimit -n 1024 ; fi'
+  - 'if [ $TRAVIS_OS_NAME = osx ] ; then ulimit -n 2048 ; fi'
 
 matrix:
   include:
-    - python: "2.7"
-      env: TOXENV=py27_install BOULDER_INTEGRATION=1
-      sudo: required
-      services: docker
-    - python: "2.7"
-      env: TOXENV=cover FYI="this also tests py27"
-    - sudo: required
-      env: TOXENV=nginx_compat
-      services: docker
-      before_install:
-      addons:
-    - python: "2.7"
-      env: TOXENV=lint
-    - python: "2.6"
-      env: TOXENV=py26
-      sudo: required
-      services: docker
-    - python: "2.7"
-      env: TOXENV=py27-oldest
-      sudo: required
-      services: docker
-    - python: "3.3"
-      env: TOXENV=py33
-      sudo: required
-      services: docker
-    - python: "3.6"
-      env: TOXENV=py36
-      sudo: required
-      services: docker
-    - sudo: required
-      env: TOXENV=apache_compat
-      services: docker
-      before_install:
-      addons:
-    - sudo: required
-      env: TOXENV=le_auto_trusty
-      services: docker
-      before_install:
-      addons:
-    - python: "2.7"
-      env: TOXENV=apacheconftest
-      sudo: required
-    - python: "2.7"
-      env: TOXENV=nginxroundtrip
+    - language: generic
+      env: TOXENV=py27
+      os: osx
 
 
 # Only build pushes to the master branch, PRs, and branches beginning with
@@ -97,12 +56,3 @@ script:
     - '[ -z "${BOULDER_INTEGRATION+x}" ] || (travis_retry tests/boulder-fetch.sh && tests/tox-boulder-integration.sh)'
 
 after_success: '[ "$TOXENV" == "cover" ] && coveralls'
-
-notifications:
-  email: false
-  irc:
-    channels:
-      - secure: "SGWZl3ownKx9xKVV2VnGt7DqkTmutJ89oJV9tjKhSs84kLijU6EYdPnllqISpfHMTxXflNZuxtGo0wTDYHXBuZL47w1O32W6nzuXdra5zC+i4sYQwYULUsyfOv9gJX8zWAULiK0Z3r0oho45U+FR5ZN6TPCidi8/eGU+EEPwaAw="
-    on_success: never
-    on_failure: always
-    use_notice: true

pytest.ini

@@ -1,2 +0,0 @@
-[pytest]
-addopts = --quiet

tools/pytest.sh

@@ -6,10 +6,4 @@
 # environnment provides two cores. See
 # https://docs.travis-ci.com/user/reference/overview/#Virtualization-environments.
 
-if ${TRAVIS:-false}; then
-    NUMPROCESSES="2"
-else
-    NUMPROCESSES="auto"
-fi
-
-pytest --numprocesses "$NUMPROCESSES" "$@"
+pytest --full-trace --numprocesses auto --max-slave-restart 5 --boxed -vvvv "$@"