Update appveyor and travis config

Signed-off-by: Dan Ryan <dan.ryan@canonical.com> Fix appveyor pip version installed on python3.4 Signed-off-by: Dan Ryan <dan.ryan@canonical.com> Remove python 3.4 from appveyor config Signed-off-by: Dan Ryan <dan.ryan@canonical.com> Dont install readme-renderer on python 3.8 - Readme-renderer depends on cffi due to lack of wheels built for cmarkgfm - Build seems to fail for python 3.8 on appveyor Signed-off-by: Dan Ryan <dan.ryan@canonical.com> Install wheel and setuptools Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
sarugaku · Mar 9, 2020 · 0b64fd1 · 0b64fd1
1 parent 7a77147
commit 0b64fd1
Show file tree

Hide file tree

Showing 3 changed files with 131 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,35 +1,76 @@
 language: python
 sudo: false
 cache: pip
-dist: trusty
+dist: bionic
 
 
 matrix:
   fast_finish: true
   allow_failures:
   - python: "3.4"
+    python: "3.5"
 
 install:
-  - "python -m pip install ${PIP}"
+  - "python -m pip install ${PIP} setuptools wheel"
   - "python -m pip install pytest pytest-xdist pytest-cov pytest-timeout"
   - "python -m pip install -e .[tests]"
 script:
   - "python -m pytest -v -n 8 tests/"
 
 jobs:
   include:
-    - &test-pip19
+		- &test-pip20
+      stage: test-pip20
+      python: "3.6"
+      env: PIP="pip==20.0.2"
+    - <<: *test-pip20
+      python: "3.8"
+     - <<: *test-pip20
+      python: "3.7"
+    - <<: *test-pip20
+      python: "3.5"
+      dist: xenial
+      sudo: required
+    - <<: *test-pip20
+      python: "3.4"
+      dist: xenial
+      sudo: required
+    - <<: *test-pip20
+      python: "2.7"
+    - &test-pip193
+      stage: test-pip193
+      python: "3.6"
+      env: PIP="pip==19.3.1"
+    - <<: *test-pip193
+      python: "3.8"
+     - <<: *test-pip193
+      python: "3.7"
+    - <<: *test-pip193
+      python: "3.5"
+      dist: xenial
+      sudo: required
+    - <<: *test-pip193
+      python: "3.4"
+      dist: xenial
+      sudo: required
+    - <<: *test-pip193
+      python: "2.7"
+		- &test-pip19
       stage: test-pip19
       python: "3.6"
       env: PIP="pip==19.0.3"
     - <<: *test-pip19
+      python: "3.8"
+     - <<: *test-pip19
       python: "3.7"
-      dist: xenial
-      sudo: required
     - <<: *test-pip19
       python: "3.5"
+      dist: xenial
+      sudo: required
     - <<: *test-pip19
       python: "3.4"
+      dist: xenial
+      sudo: required
     - <<: *test-pip19
       python: "2.7"
     - &test-pip181
@@ -38,12 +79,14 @@ jobs:
       env: PIP="pip==18.1"
     - <<: *test-pip181
       python: "3.7"
-      dist: xenial
-      sudo: required
     - <<: *test-pip181
       python: "3.5"
+      dist: xenial
+      sudo: required
     - <<: *test-pip181
       python: "3.4"
+      dist: xenial
+      sudo: required
     - <<: *test-pip181
       python: "2.7"
     - &test-pipmaster
@@ -56,12 +99,14 @@ jobs:
         - "python -m pip install -e .[tests] --no-use-pep517"
     - <<: *test-pipmaster
       python: "3.7"
-      dist: xenial
-      sudo: required
     - <<: *test-pipmaster
       python: "3.5"
+      dist: xenial
+      sudo: required
     - <<: *test-pipmaster
       python: "3.4"
+      dist: xenial
+      sudo: required
     - <<: *test-pipmaster
       python: "2.7"
     - &test-pip9
@@ -70,12 +115,14 @@ jobs:
       env: PIP="pip==9.0.3"
     - <<: *test-pip9
       python: "3.7"
-      dist: xenial
-      sudo: required
     - <<: *test-pip9
       python: "3.5"
+      dist: xenial
+      sudo: required
     - <<: *test-pip9
       python: "3.4"
+      dist: xenial
+      sudo: required
     - <<: *test-pip9
       python: "2.7"
     - &test-pip10
@@ -84,12 +131,14 @@ jobs:
       env: PIP="pip==10.0.1"
     - <<: *test-pip10
       python: "3.7"
-      dist: xenial
-      sudo: required
     - <<: *test-pip10
       python: "3.5"
+      dist: xenial
+      sudo: required
     - <<: *test-pip10
       python: "3.4"
+      dist: xenial
+      sudo: required
     - <<: *test-pip10
       python: "2.7"
     - &test-pip180
@@ -98,12 +147,14 @@ jobs:
       env: PIP="pip==18.0"
     - <<: *test-pip180
       python: "3.7"
-      dist: xenial
-      sudo: required
     - <<: *test-pip180
       python: "3.5"
+      dist: xenial
+      sudo: required
     - <<: *test-pip180
       python: "3.4"
+      dist: xenial
+      sudo: required
     - <<: *test-pip180
       python: "2.7"
     - stage: packaging

diff --git a/appveyor.yml b/appveyor.yml
@@ -5,51 +5,96 @@ environment:
       RUN_INTEGRATION_TESTS: "True"
     - PYTHON: "C:\\Python36-x64"
       RUN_INTEGRATION_TESTS: "True"
+    - PYTHON: "C:\\Python37-x64"
+      RUN_INTEGRATION_TESTS: "True"
+    - PYTHON: "C:\\Python38-x64"
+      RUN_INTEGRATION_TESTS: "True"
     # Unit tests only.
     - PYTHON: "C:\\Python27-x64"
-    - PYTHON: "C:\\Python34-x64"
     - PYTHON: "C:\\Python35-x64"
     - PYTHON: "C:\\Python36-x64"
+    - PYTHON: "C:\\Python37-x64"
+    - PYTHON: "C:\\Python38-x64"
+    - PYTHON: "C:\\Python27-x64"
+      PIP: "20.0.2"
+    - PYTHON: "C:\\Python35-x64"
+      PIP: "20.0.2"
+    - PYTHON: "C:\\Python36-x64"
+      PIP: "20.0.2"
+    - PYTHON: "C:\\Python37-x64"
+      PIP: "20.0.2"
+    - PYTHON: "C:\\Python38-x64"
+      PIP: "20.0.2"
+    - PYTHON: "C:\\Python27-x64"
+      PIP: "19.3.1"
+    - PYTHON: "C:\\Python35-x64"
+      PIP: "19.3.1"
+    - PYTHON: "C:\\Python36-x64"
+      PIP: "19.3.1"
+    - PYTHON: "C:\\Python37-x64"
+      PIP: "19.3.1"
+    - PYTHON: "C:\\Python38-x64"
+      PIP: "19.3.1"
+    - PYTHON: "C:\\Python27-x64"
+      PIP: "19.2.3"
+    - PYTHON: "C:\\Python35-x64"
+      PIP: "19.2.3"
+    - PYTHON: "C:\\Python36-x64"
+      PIP: "19.2.3"
+    - PYTHON: "C:\\Python37-x64"
+      PIP: "19.2.3"
+    - PYTHON: "C:\\Python38-x64"
+      PIP: "19.2.3"
     - PYTHON: "C:\\Python27-x64"
-      PIP: "19.0.3"
-    - PYTHON: "C:\\Python34-x64"
       PIP: "19.0.3"
     - PYTHON: "C:\\Python35-x64"
       PIP: "19.0.3"
     - PYTHON: "C:\\Python36-x64"
       PIP: "19.0.3"
+    - PYTHON: "C:\\Python37-x64"
+      PIP: "19.0.3"
+    - PYTHON: "C:\\Python38-x64"
+      PIP: "19.0.3"
     - PYTHON: "C:\\Python27-x64"
       PIP: "18.1"
-    - PYTHON: "C:\\Python34-x64"
-      PIP: "18.1"
     - PYTHON: "C:\\Python35-x64"
       PIP: "18.1"
     - PYTHON: "C:\\Python36-x64"
       PIP: "18.1"
+    - PYTHON: "C:\\Python37-x64"
+      PIP: "18.1"
+    - PYTHON: "C:\\Python38-x64"
+      PIP: "18.1"
     - PYTHON: "C:\\Python27-x64"
       PIP: "18.0"
-    - PYTHON: "C:\\Python34-x64"
-      PIP: "18.0"
     - PYTHON: "C:\\Python35-x64"
       PIP: "18.0"
     - PYTHON: "C:\\Python36-x64"
       PIP: "18.0"
+    - PYTHON: "C:\\Python37-x64"
+      PIP: "18.0"
+    - PYTHON: "C:\\Python38-x64"
+      PIP: "18.0"
     - PYTHON: "C:\\Python27-x64"
       PIP: "10.0.1"
-    - PYTHON: "C:\\Python34-x64"
-      PIP: "10.0.1"
     - PYTHON: "C:\\Python35-x64"
       PIP: "10.0.1"
     - PYTHON: "C:\\Python36-x64"
       PIP: "10.0.1"
+    - PYTHON: "C:\\Python37-x64"
+      PIP: "10.0.1"
+    - PYTHON: "C:\\Python38-x64"
+      PIP: "10.0.1"
     - PYTHON: "C:\\Python27-x64"
       PIP: "9.0.3"
-    - PYTHON: "C:\\Python34-x64"
-      PIP: "9.0.3"
     - PYTHON: "C:\\Python35-x64"
       PIP: "9.0.3"
     - PYTHON: "C:\\Python36-x64"
       PIP: "9.0.3"
+    - PYTHON: "C:\\Python37-x64"
+      PIP: "9.0.3"
+    - PYTHON: "C:\\Python38-x64"
+      PIP: "9.0.3"
 
 install:
   - ps: |
@@ -80,6 +125,11 @@ install:
       If ($LastExitCode -ne 0) {
         exit $LastExitCode
       }
+      if ( $env:PYTHON -eq "3.4" ) {
+        Invoke-Expression "$py_exe -m pip install --upgrade --upgrade-strategy=eager pip==19.1 setuptools wheel"
+      } else {
+        Invoke-Expression "$py_exe -m pip install --upgrade --upgrade-strategy=eager pip setuptools wheel"
+      }
 
       Invoke-Expression "$py_exe -m pip install --upgrade setuptools pytest pytest-xdist pytest-timeout"
       If ($LastExitCode -ne 0) {
@@ -93,6 +143,9 @@ install:
 
       if ( $env:PIP ) {
         Invoke-Expression "$py_exe -m pip install -e .[tests]"
+        If ($LastExitCode -ne 0) {
+            Invoke-Expression "$py_exe -m pip install -e .[tests] --no-use-pep517"
+        }
       }
       else {
         Invoke-Expression "$py_exe -m pip install -e .[tests] --no-use-pep517"

diff --git a/setup.cfg b/setup.cfg
@@ -58,7 +58,7 @@ tests =
     pytest-xdist
     pytest-cov
     twine
-    readme-renderer[md]
+    readme-renderer[md];python_version<"3.8"
 dev =
     pre-commit
     mypy;python_version>="3.5"