From e07c53f948610c0fc9a602013108c021269859ad Mon Sep 17 00:00:00 2001
From: Chris Barnes <barnesc@janelia.hhmi.org>
Date: Tue, 10 Sep 2019 15:51:13 -0400
Subject: [PATCH] update travis

---
 .travis.yml | 45 +++++++++++++++------------------------------
 1 file changed, 15 insertions(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 79f40a5..0a0b532 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,56 +1,41 @@
 language: python
+dist: xenial
 python:
-  - 3.5
+  - 3.7
 
 stages:
   - test
   - name: deploy
-    if: tag IS present
+    if: (branch = master) AND (tag =~ ^v\d+.*$)
 env:
   global:
   - TRAVIS_RUST_VERSION=nightly-2019-07-01
   - RUST_BACKTRACE=1
-  - PYPI_USERNAME=pattonw
 
 test_template: &test_template
   stage: test
   before_install:
-    source ./ci/travis/setup_rust.sh
+    - source ./ci/travis/setup_rust.sh
   install:
     - make install-dev
   script:
     - make test
 
-deploy_template: &deploy_template
-  stage: deploy
-  sudo: required
-  install:
-    pip install maturin==0.7.1b1
-  script:
-    maturin publish -i python --no-sdist -u PYPI_USERNAME -p PYPI_PASSWORD
-
-# todo: sdist
-
 jobs:
   include:
     - <<: *test_template
+      name: "test py36"
       python: 3.6
     - <<: *test_template
-      dist: xenial
-      python: 3.7
-      sudo: required
-    - <<: *deploy_template
-      python: 3.6
-    - <<: *deploy_template
-      dist: xenial
-      sudo: required
-      python: 3.7
+      name: "test py37"
     - stage: deploy
+      addons:
+        apt:
+          packages:
+            - python3.6
+      before_install:
+        - source ./ci/travis/setup_rust.sh
+      install:
+        - pip install maturin==0.7.2
       script:
-        echo "skip"
-      deploy:
-        distributions: sdist
-        password:
-          secure: VeZNGpUs5ne3ZlCeZLPbT+3O6yRDM9sv8emg6m90ZwLuZAlXV0t2dGHKccMTBMbS2jWSy2q4TY2IkN0SOWrOmi53Klt3K5Y461Ra8dT+XdmXK8g+36HJEJKWfFvVpYVuIw72yoUWHZsr2iNxi7tiAc/AjBvbnbgSXuAayuVm+8K7tQ85kkfbdBErDQnhziEiqtIrjak3hwBgjWpm0UEuAKG/eTBFk0BAN9wqRajCS58WLaLVnF4FtAHT4QAxo33j99njB7cz8PLjXNd3BxT2BpMbjqmg8krVW7ayMJKdLvWdICezPB4nlsnL9jBlXMaRvI0ijSl59QkVCDbkrERUCR7IdJZqAX3IFSe+9X1cwzJsJeXYOfQjYMX+ZyqR8qcmQKS6M1u3uYMXhoj+TU9uO0sK4dNxrS0DRhg22TdjAcpqnz0UDVVWfFapltroE0ePVPs8aOOqdpJewRDPDI0ghRg/nzrSIhEI+85XnSTcjm4if5hwiEFchIFlV5d/ZIHtPn+b0fCRTDMq4kjObxD9uBbVvda1+CESCNrE91oB1erlrjygsDnpdRWi5dzaOVe5DJmAxT/V5mPFlskOPJLZr3lzZOQm1FGVJbvTN766plDCWozTAG8wT58hq/nJTBIiRjHlQnhFjlHLkaWTEq/jJ8mA++KXvbofCy833V0OMrw=
-        provider: pypi
-        user: pattonw
+        - maturin publish -u pattonw -p PYPI_PASSWORD -i python3.6 -i python3.7