From 8ad9fa45df7d9e7c502fce993c0ca74ed833ea2c Mon Sep 17 00:00:00 2001
From: Samuel Colvin <s@muelcolvin.com>
Date: Thu, 6 Jun 2019 16:59:21 +0100
Subject: [PATCH] tweak travis (#581)

* tweak travis

* fix codecov env vars

* try again with env vars
---
 .travis.yml | 49 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6a78adf..ae2585b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,9 +22,14 @@ script:
 - make mypy
 - make external-mypy
 
+env:
+  global:
+  - 'CYTHON=no'
+  - 'DEPS=yes'
+
 after_success:
 - ls -lha
-- bash <(curl -s https://codecov.io/bash)
+- bash <(curl -s https://codecov.io/bash) -e CYTHON,DEPS
 
 jobs:
   allow_failures:
@@ -33,35 +38,43 @@ jobs:
   include:
   - stage: test
     python: 3.6
-    name: 'Cython 3.6'
+    name: 'Cython: 3.6'
     script:
-      # test with cython, ujson and email-validator
-      - make build-cython-trace
-      - python -c "import sys, pydantic; print('compiled:', pydantic.compiled); sys.exit(0 if pydantic.compiled else 1)"
-      - make test
+    # test with cython, ujson and email-validator
+    - make build-cython-trace
+    - python -c "import sys, pydantic; print('compiled:', pydantic.compiled); sys.exit(0 if pydantic.compiled else 1)"
+    - make test
+    env:
+    - 'CYTHON=yes'
   - stage: test
     python: 3.7
-    name: 'Cython 3.7'
+    name: 'Cython: 3.7'
     script:
-      # test with cython, ujson and email-validator
-      - make build-cython-trace
-      - python -c "import sys, pydantic; print('compiled:', pydantic.compiled); sys.exit(0 if pydantic.compiled else 1)"
-      - make test
+    # test with cython, ujson and email-validator
+    - make build-cython-trace
+    - python -c "import sys, pydantic; print('compiled:', pydantic.compiled); sys.exit(0 if pydantic.compiled else 1)"
+    - make test
+    env:
+    - 'CYTHON=yes'
 
   - stage: test
     python: 3.6
     name: 'Without Deps 3.6'
     script:
-      # test without cython, ujson and email-validator
-      - pip uninstall -y ujson email-validator
-      - make test
+    # test without cython, ujson and email-validator
+    - pip uninstall -y ujson email-validator
+    - make test
+    env:
+    - 'DEPS=no'
   - stage: test
     python: 3.7
     name: 'Without Deps 3.7'
     script:
-      # test without cython, ujson and email-validator
-      - pip uninstall -y ujson email-validator cython
-      - make test
+    # test without cython, ujson and email-validator
+    - pip uninstall -y ujson email-validator cython
+    - make test
+    env:
+    - 'DEPS=no'
 
   - stage: test
     python: 3.7
@@ -85,6 +98,7 @@ jobs:
     - cibuildwheel --output-dir dist
     - SKIP_CYTHON=1 python setup.py sdist bdist_wheel
     - ls -lha dist
+    after_success: skip
     env:
     - 'PIP=pip'
     - 'CIBW_BUILD="cp36-manylinux1_x86_64 cp36-manylinux1_i686 cp37-manylinux1_x86_64 cp37-manylinux1_i686"'
@@ -104,6 +118,7 @@ jobs:
     if: type = push AND (branch = master OR tag IS present)
     python: 3.7
     script: make docs
+    after_success: skip
     env:
     - secure: "vpTd8bkwPBP0CV3EJBAwSMNMnNK3m/71dvTvBd1T4YGuefyJvYhtA7wauA5xRL9jpK2mu5QR5eo0owTUJhKi4DjpafMMd1bc4PnXlrdZFzkn3VsGmlKt74D/aJgiuiNyhd/Qvq4OxMHrMhf4f6lKWoMM1vh6yT0yp3+51SexSh2Me0Q+npxbjXwoxX5XUHRcoSLtFk4GbYI88a2I+08XWI6v+Awo/giQ5QurUJhjAklbosrrQVr1FCOkU0em5jeyZvEbZSLmaMtbX1JlRdKoJm6WMU+y9I7zj35w6ue/vgfcLz7b/HDZrBx7/L9g1LxRo80briueX/IbHvN7DOVFKvaXVmnEa6lIDdCeOLOyESpIbmjqmDKi8JeexdPNxKq4Tvo2VEA9dL2w2aw+aALNtU2OF5iEMfPTUQyosu/CNu2PKtiuZkSOdvpYbSy1WUNHJRvomdR4Olzg8ZIScNsxU3IIPdrlG/LUA8auXcE9juFeZfD6D2hQZATqWeEe/C2J7amNSD+mLLaTf6nMQw8oNtKYOvYK17M7xyvi7HXDy711Bi18U3x6Ye0xGx8CDbFwl0ICNzIk9rrSAh9hEHTvfdUUkk35pxifvO0Hrh4SArCA20ozcH/hHWBhyqGdxoIQ6KoDgNbIFIGQ6/vugxL/pt8z1sJwPfJnq8tRDAyWZvE="
     deploy: