fix: Fix azure build

untitaker · untitaker · commit 33473b8962b1 · 2019-10-01T21:25:36.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -20,15 +20,9 @@ branches:
     - /^release\/.+$/
 
 matrix:
-  allow_failures:
-    - python: "3.8-dev"
-
   include:
     - python: "3.7"
       dist: xenial
-    - python: "3.8-dev"
-      dist: xenial
-
     - name: Linting
       python: "3.6"
       install:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -34,10 +34,6 @@ jobs:
           python.version: "3.6"
         Python37:
           python.version: "3.7"
-        # Python 3.8 and PyPy will be soon added to the base VM image:
-        #   https://github.com/Microsoft/azure-pipelines-tasks/pull/9866
-        Python38:
-          python.version: "3.8-dev"
         PyPy2:
           python.version: "pypy2"
 
diff --git a/scripts/runtox.sh b/scripts/runtox.sh
@@ -18,6 +18,9 @@ elif [ -n "$TRAVIS_PYTHON_VERSION" ]; then
     searchstring="$(echo py$TRAVIS_PYTHON_VERSION | sed -e 's/pypypy/pypy/g' -e 's/-dev//g')"
 elif [ -n "$AZURE_PYTHON_VERSION" ]; then
     searchstring="$(echo py$AZURE_PYTHON_VERSION | sed -e 's/pypypy/pypy/g' -e 's/-dev//g')"
+    if [ "$searchstring" = pypy2 ]; then
+        searchstring=pypy
+    fi
 fi
 
 exec $TOXPATH -e $($TOXPATH -l | grep "$searchstring" | tr '\n' ',') -- "${@:2}"
diff --git a/tox.ini b/tox.ini
@@ -6,7 +6,7 @@
 [tox]
 envlist =
     # === Core ===
-    py{2.7,3.4,3.5,3.6,3.7,3.8}
+    py{2.7,3.4,3.5,3.6,3.7}
     pypy
 
 
@@ -20,16 +20,16 @@ envlist =
     {pypy,py2.7,py3.4}-django-1.7
     {pypy,py2.7}-django-1.6
 
-    {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-flask-{1.1,1.0,0.11,0.12,dev}
+    {pypy,py2.7,py3.5,py3.6,py3.7}-flask-{1.1,1.0,0.11,0.12,dev}
 
-    {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-bottle-0.12
+    {pypy,py2.7,py3.5,py3.6,py3.7}-bottle-0.12
 
-    {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-falcon-1.4
-    {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-falcon-2.0
+    {pypy,py2.7,py3.5,py3.6,py3.7}-falcon-1.4
+    {pypy,py2.7,py3.5,py3.6,py3.7}-falcon-2.0
 
     {py3.5,py3.6,py3.7}-sanic-{0.8,18}
 
-    {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.1,4.2,4.3}
+    {pypy,py2.7,py3.5,py3.6,py3.7}-celery-{4.1,4.2,4.3}
     {pypy,py2.7}-celery-3
 
     py2.7-beam-{12,13}
@@ -38,14 +38,14 @@ envlist =
     # The aws_lambda tests deploy to the real AWS and have their own matrix of Python versions.
     py3.7-aws_lambda
 
-    {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-pyramid-{1.3,1.4,1.5,1.6,1.7,1.8,1.9,1.10}
+    {pypy,py2.7,py3.5,py3.6,py3.7}-pyramid-{1.3,1.4,1.5,1.6,1.7,1.8,1.9,1.10}
 
     {pypy,py2.7,py3.5,py3.6}-rq-{0.6,0.7,0.8,0.9,0.10,0.11}
-    {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-rq-{0.12,0.13,1.0,1.1}
+    {pypy,py2.7,py3.5,py3.6,py3.7}-rq-{0.12,0.13,1.0,1.1}
 
     py3.7-aiohttp-{3.5,3.6}
 
-    {py3.7,py3.8}-tornado-{5,6}
+    {py3.7}-tornado-{5,6}
 
     {py2.7,py3.7}-requests
 
@@ -197,7 +197,6 @@ basepython =
     py3.5: python3.5
     py3.6: python3.6
     py3.7: python3.7
-    py3.8: python3.8
     linters: python3
     pypy: pypy
 
