From 538a67dc3afe6272b045d37766b1d9f0a5d5044e Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@corte.si>
Date: Wed, 7 Mar 2018 11:50:47 +1300
Subject: release: cleanup and re-enable all our Travis tests

Wheels are yet to come.
---
 .travis.yml      | 66 ++++++++++++++++++++++++++++----------------------------
 release/rtool.py |  3 ---
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2d3c4626..23910601 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,43 +16,43 @@ git:
 matrix:
   fast_finish: true
   include:
-    # - python: 3.6
-    #   env: TOXENV=lint
+    - python: 3.6
+      env: TOXENV=lint
     - os: osx
       osx_image: xcode7.3
       language: generic
       env: TOXENV=py36 BDIST=1
-    # - python: 3.5
-    #   env: TOXENV=py35
-    #   dist: precise
-    # - python: 3.6
-    #   env: TOXENV=py36 BDIST=1
-    # - python: 3.6
-    #   env: TOXENV=individual_coverage
-    # - language: node_js
-    #   node_js: "node"
-    #   before_install:
-    #       - curl -o- -L https://yarnpkg.com/install.sh | bash
-    #       - export PATH=$HOME/.yarn/bin:$PATH
-    #   install:
-    #       - cd web && yarn
-    #       - yarn global add codecov
-    #   script: npm test && codecov
-    #   cache:
-    #       yarn: true
-    #       directories:
-    #           - web/node_modules
-    # - language: python
-    #   env:
-    #     - NAME=docs
-    #   install:
-    #     - wget https://github.com/gohugoio/hugo/releases/download/v0.37/hugo_0.37_Linux-64bit.deb
-    #     - sudo dpkg -i hugo*.deb
-    #     - pip install awscli
-    #   script:
-    #     - cd docs && ./ci
-    #   after_success:
-    #     - echo done
+    - python: 3.5
+      env: TOXENV=py35
+      dist: precise
+    - python: 3.6
+      env: TOXENV=py36 BDIST=1
+    - python: 3.6
+      env: TOXENV=individual_coverage
+    - language: node_js
+      node_js: "node"
+      before_install:
+          - curl -o- -L https://yarnpkg.com/install.sh | bash
+          - export PATH=$HOME/.yarn/bin:$PATH
+      install:
+          - cd web && yarn
+          - yarn global add codecov
+      script: npm test && codecov
+      cache:
+          yarn: true
+          directories:
+              - web/node_modules
+    - language: python
+      env:
+        - NAME=docs
+      install:
+        - wget https://github.com/gohugoio/hugo/releases/download/v0.37/hugo_0.37_Linux-64bit.deb
+        - sudo dpkg -i hugo*.deb
+        - pip install awscli
+      script:
+        - cd docs && ./ci
+      after_success:
+        - echo done
 
 install:
   - |
diff --git a/release/rtool.py b/release/rtool.py
index 0eda7e6c..a3f49914 100755
--- a/release/rtool.py
+++ b/release/rtool.py
@@ -1,11 +1,9 @@
 #!/usr/bin/env python3
 
 import contextlib
-import fnmatch
 import os
 import sys
 import platform
-import re
 import runpy
 import shlex
 import subprocess
@@ -14,7 +12,6 @@ import zipfile
 from os.path import join, abspath, dirname
 
 import click
-import pysftp
 
 # https://virtualenv.pypa.io/en/latest/userguide.html#windows-notes
 # scripts and executables on Windows go in ENV\Scripts\ instead of ENV/bin/
-- 
cgit v1.2.3