Merge pull request #409 from tomato42/py37

Travis fixups
tlsfuzzer · May 25, 2020 · d324e95 · d324e95
2 parents 9912a51 + 11da40c
commit d324e95
Showing 1 changed file with 44 additions and 36 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,6 @@
+dist: trusty
+sudo: false
+cache: pip
 language: python
 
 # whitelist branches on which tests will be run
@@ -14,54 +17,51 @@ addons:
     - swig
     # needed for GMPY
     - libgmp-dev
+before_cache:
+  - rm -f $HOME/.cache/pip/log/debug.log
 
-python:
-  - 2.6
-  - 2.7
-  - 3.3
-  - 3.4
-  - 3.5
-  - 3.6
-  - 3.7
-
-# workaround for 3.7 not available in default configuration
-# travis-ci/travis-ci#9815
-dist: trusty
-sudo: false
-
-env:
-  - TACKPY=true
-  - TACKPY=false
-
-matrix:
-  exclude:
-    - env: TACKPY=true
-# workaround for 3.7 not available in default configuration
-# travis-ci/travis-ci#9815
-    - python: 3.7
+jobs:
   include:
+    - python: 2.6
+      env: TACKPY=false
+    - python: 2.7
+      env: TACKPY=false
+    - python: 3.3
+      env: TACKPY=false
+    - python: 3.4
+      env: TACKPY=false
+    - python: 3.5
+      env: TACKPY=false
+    - python: 3.6
+      env: TACKPY=false
+    - python: 3.7
+      dist: xenial
+      sudo: true
+      env: TACKPY=false
+    - python: 3.8
+      dist: xenial
+      sudo: true
+      env: TACKPY=false
     - python: 2.7
       env: TACKPY=true
     - python: 3.4
       env: TACKPY=true
     - python: 2.7
       env: M2CRYPTO=true
-    - python: 3.4
-      env: M2CRYPTO=true
     - python: 3.5
       env: M2CRYPTO=true
     - python: 3.6
       env: M2CRYPTO=true
-# workaround for 3.7 not available in default configuration
-# travis-ci/travis-ci#9815
     - python: 3.7
       dist: xenial
       sudo: true
       env: M2CRYPTO=true
+    - python: 3.8
+      dist: xenial
+      sudo: true
+      env: M2CRYPTO=true
     - python: 2.7
       env: PYCRYPTO=true
-    - python: 3.4
-      env: PYCRYPTO=true
     - python: 3.5
       env: PYCRYPTO=true
     - python: 3.6
@@ -70,10 +70,14 @@ matrix:
       dist: xenial
       sudo: true
       env: PYCRYPTO=true
+    # pycrypto doesn't work on Python 3.8 as time module doesn't have clock()
+    # any more
+    #- python: 3.8
+    #  dist: xenial
+    #  sudo: true
+    #  env: PYCRYPTO=true
     - python: 2.7
       env: GMPY=true
-    - python: 3.4
-      env: GMPY=true
     - python: 3.5
       env: GMPY=true
     - python: 3.6
@@ -82,10 +86,12 @@ matrix:
       dist: xenial
       sudo: true
       env: GMPY=true
+    - python: 3.8
+      dist: xenial
+      sudo: true
+      env: GMPY=true
     - python: 2.7
       env: M2CRYPTO=true PYCRYPTO=true GMPY=true
-    - python: 3.4
-      env: M2CRYPTO=true PYCRYPTO=true GMPY=true
     - python: 3.5
       env: M2CRYPTO=true PYCRYPTO=true GMPY=true
     - python: 3.6
@@ -94,6 +100,10 @@ matrix:
       dist: xenial
       sudo: true
       env: M2CRYPTO=true PYCRYPTO=true GMPY=true CC_COV=true
+    - python: 3.8
+      dist: xenial
+      sudo: true
+      env: M2CRYPTO=true GMPY=true
 
 before_install:
   - |
@@ -163,8 +173,6 @@ script:
         done
       fi
 
-sudo: false
-
 after_success:
  - travis_retry coveralls
  - if [[ $CC_COV == 'true' ]]; then coverage xml; ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi