summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml14
1 files changed, 12 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 7fba1a3a..1e76821e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
language: python
sudo: false
+stage: test
before_install:
- env
@@ -78,27 +79,36 @@ matrix:
os: osx
env: TOXENV=py37
- # TODO: make these integration tests
- python: 2.7
env: DOWNSTREAM=requests
+ stage: integration
- python: 3.7
env: DOWNSTREAM=requests
dist: xenial
sudo: required
+ stage: integration
- python: 2.7
env: DOWNSTREAM=botocore
+ stage: integration
- python: 3.7
env: DOWNSTREAM=botocore
dist: xenial
sudo: required
-
+ stage: integration
allow_failures:
- python: pypy-5.4
+stages:
+ - test
+
+ # Run integration tests for release candidates
+ - name: integration
+ if: type = pull_request AND head_branch =~ ^release-[\d.]+$
+
deploy:
- provider: script
script: bash _travis/deploy.sh