Commit 86caebdb authored by nimrod's avatar nimrod
Browse files

Merge branch 'master' into feature/tox_env 

# Conflicts:
#	.travis.yml
parents 9d23c682 d1a9b0c6

.travis.yml

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ env: 
        - TOXENV=trusty

        - TOXENV=precise

        - &stretch TOXENV=stretch

        - TOXENV=jessie

        - &jessie TOXENV=jessie

        - TOXENV=wheezy

matrix:

    fast_finish: True
@@ -23,6 +23,7 @@ matrix: 
        - python: "3.5"

        - env: *openbsd59

        - env: *stretch

        - env: *jessie

cache:

  - pip

  - directories: