فهرست منبع

fixup! Add Django 1.11b1 to Travis as allow_failures

Matt Westcott 8 سال پیش
والد
کامیت
cc3b826025
2فایلهای تغییر یافته به همراه3 افزوده شده و 1 حذف شده
  1. 2 0
      .travis.yml
  2. 1 1
      tox.ini

+ 2 - 0
.travis.yml

@@ -76,6 +76,8 @@ matrix:
      python: 3.5
      sudo: true
   allow_failures:
+    # Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky;
+    # ignore failures on Django 1.11 because we're still working on supporting it
     - env: TOXENV=py27-dj110-mysql-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
     - env: TOXENV=py27-dj111-sqlite-noelasticsearch
     - env: TOXENV=py27-dj111-postgres-noelasticsearch

+ 1 - 1
tox.ini

@@ -25,7 +25,7 @@ deps =
     dj18: Django>=1.8.1,<1.9
     dj110: Django>=1.10a1,<1.11
     dj110head: git+https://github.com/django/django.git@stable/1.10.x#egg=Django
-    dj111: Django>=1.11b1,<1.12
+    dj111: Django>=1.11b1,<2.0
     postgres: psycopg2>=2.6
     mysql: mysqlclient==1.3.6
     elasticsearch: elasticsearch>=1,<2