diff options
| author | Brad Warren <bmw@eff.org> | 2018-03-01 21:21:55 +0300 |
|---|---|---|
| committer | Brad Warren <bmw@eff.org> | 2018-03-01 21:21:55 +0300 |
| commit | 184b384b580271bc652af7709c472d7cf1d96925 (patch) | |
| tree | 620f7b1f52ac07231453ec171ba19220cb099618 /.travis.yml | |
| parent | 13b6b3f1b315360958256e2159a15a22ada6e465 (diff) | |
| parent | 559220c2eff90975fb671945d780c2a757d0e167 (diff) | |
Merge branch 'master' into update-test-everything
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 866f7b12a..e9699a616 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,12 +27,12 @@ matrix: env: TOXENV=py27-oldest BOULDER_INTEGRATION=1 sudo: required services: docker - - python: "2.6" - env: TOXENV=py26 BOULDER_INTEGRATION=1 + - python: "2.7" + env: TOXENV=py27_install BOULDER_INTEGRATION=v2 sudo: required services: docker - python: "2.7" - env: TOXENV=py27_install BOULDER_INTEGRATION=1 + env: TOXENV=py27_install BOULDER_INTEGRATION=v1 sudo: required services: docker - sudo: required @@ -73,10 +73,6 @@ matrix: - python: "2.7" env: TOXENV=apacheconftest sudo: required - - python: "3.3" - env: TOXENV=py33 BOULDER_INTEGRATION=1 - sudo: required - services: docker - python: "3.4" env: TOXENV=py34 BOULDER_INTEGRATION=1 sudo: required |