Merge the async branch

2018-02-18 13:45:08 +01:00
parent 98761f6994 5b184fbd0c
commit 8f4b68ae39
6 changed files with 184 additions and 39 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,11 +23,11 @@ matrix:
        - JEDI_TEST_ENVIRONMENT=36
    - python: 3.7-dev
  include:
-    - python: 3.5
+    - python: 3.6
      env:
        - TOXENV=cov
        - JEDI_TEST_ENVIRONMENT=36
-    - python: 3.5
+    - python: 3.6
      env: TOXENV=sith
    # For now ignore pypy, there are so many issues that we don't really need
    # to run it.