Merge branch '3.6'

aio-libs · Oct 9, 2019 · 90f708f · 90f708f
2 parents 28ba9d7 + 6a5ab96
commit 90f708f
Show file tree

Hide file tree

Showing 5 changed files with 177 additions and 84 deletions.
diff --git a/.azure-pipelines/deploy.yml b/.azure-pipelines/deploy.yml
@@ -1,7 +1,7 @@
 trigger:
-  branches:
+  tags:
     include:
-    - refs/tags/*
+    - v?.*
 pr: none
 
 

diff --git a/.azure-pipelines/stage-test.yml b/.azure-pipelines/stage-test.yml
@@ -61,7 +61,7 @@ stages:
         architecture: 'x64'
 
     - script: |
-        python -m pip install --upgrade pip
+        python -m pip install --upgrade pip setuptools
       displayName: 'Update pip'
 
     - script: |

diff --git a/.travis.yml b/.travis.yml
@@ -225,6 +225,7 @@ jobs:
   fast_finish: true
   allow_failures:
   - python: nightly
+  - python: pypy3.5
 
   include:
   - name: 3.7 without extensions