Merge pull request #208 from blueyed/travis-improvements

Travis: travis_retry, allow failures with Django master, sudo=false

.travis.yml

@@ -1,3 +1,5 @@
+# Use container-based environment (faster startup, allows caches).
+sudo: false
 language: python
 python:
   - "3.4"
@@ -26,6 +28,21 @@ env:
   - TESTENV=checkqa-python3.4
   - TESTENV=checkqa-pypy
   - TESTENV=checkqa-pypy3
+matrix:
+  allow_failures:
+    - env: TESTENV=pypy-master-sqlite_file
+    - env: TESTENV=pypy3-master-sqlite_file
+    - env: TESTENV=python2.7-master-mysql_innodb
+    - env: TESTENV=python2.7-master-mysql_myisam
+    - env: TESTENV=python2.7-master-sqlite_file
+    - env: TESTENV=python3.2-master-sqlite_file
+    - env: TESTENV=python3.3-master-sqlite_file
+    - env: TESTENV=python3.4-master-postgres
+    - env: TESTENV=python3.4-master-sqlite
+    - env: TESTENV=python3.4-master-sqlite_file
+before_install:
+  # Wrap "pip" with "travis_retry" to retry on network failures.
+  - pip() { travis_retry command pip "$@"; }
 install:
   - pip install tox
 script: tox -e $TESTENV

generate_configurations.py

@@ -209,23 +209,35 @@ def make_tox_ini(envs, default_envs):
 
 def make_travis_yml(envs):
     contents = dedent("""
+        # Use container-based environment (faster startup, allows caches).
+        sudo: false
         language: python
         python:
           - "%(RUN_PYTHON)s"
         env:
         %(testenvs)s
         %(checkenvs)s
+        matrix:
+          allow_failures:
+        %(allow_failures)s
+        before_install:
+          # Wrap "pip" with "travis_retry" to retry on network failures.
+          - pip() { travis_retry command pip "$@"; }
         install:
           - pip install tox
         script: tox -e $TESTENV
         """).strip("\n")
     testenvs = '\n'.join('  - TESTENV=%s' % testenv_name(env) for env in envs)
     checkenvs = '\n'.join('  - TESTENV=checkqa-%s' %
                           python for python in PYTHON_VERSIONS)
+    allow_failures = '\n'.join('    - env: TESTENV=%s' %
+                               testenv_name(env) for env in envs
+                               if env.django_version == 'master')
 
     return contents % {
         'testenvs': testenvs,
         'checkenvs': checkenvs,
+        'allow_failures': allow_failures,
         'RUN_PYTHON': RUN_PYTHON,
     }