Skip to content
Snippets Groups Projects
Commit 86caebdb authored by nimrod's avatar nimrod
Browse files

Merge branch 'master' into feature/tox_env 

# Conflicts:
#	.travis.yml
parents 9d23c682 d1a9b0c6
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
.travis.yml
+ 2
− 1
View file @ 86caebdb
...@@ -15,7 +15,7 @@ env: ...@@ -15,7 +15,7 @@ env:
- TOXENV=trusty - TOXENV=trusty
- TOXENV=precise - TOXENV=precise
- &stretch TOXENV=stretch - &stretch TOXENV=stretch
- TOXENV=jessie - &jessie TOXENV=jessie
- TOXENV=wheezy - TOXENV=wheezy
matrix: matrix:
fast_finish: True fast_finish: True
...@@ -23,6 +23,7 @@ matrix: ...@@ -23,6 +23,7 @@ matrix:
- python: "3.5" - python: "3.5"
- env: *openbsd59 - env: *openbsd59
- env: *stretch - env: *stretch
- env: *jessie
cache: cache:
- pip - pip
- directories: - directories:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment