فهرست منبع

Add Django stable/3.0.x to CI matrix (#5685)

Matt Westcott 5 سال پیش
والد
کامیت
94bb595d0c
2فایلهای تغییر یافته به همراه9 افزوده شده و 1 حذف شده
  1. 4 0
      .travis.yml
  2. 5 1
      tox.ini

+ 4 - 0
.travis.yml

@@ -21,6 +21,8 @@ matrix:
      python: 3.7
    - env: TOXENV=py37-dj22stable-postgres-noelasticsearch
      python: 3.7
+   - env: TOXENV=py37-dj30stable-postgres-noelasticsearch
+     python: 3.7
    - env: TOXENV=py37-djmaster-postgres-noelasticsearch
      python: 3.7
    - env: TOXENV=py38-dj22-postgres-noelasticsearch
@@ -47,6 +49,8 @@ matrix:
     - env: TOXENV=py38-dj22-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
     # allow failures against Django 2.2.x stable branch
     - env: TOXENV=py37-dj22stable-postgres-noelasticsearch
+    # allow failures against Django 3.0.x stable branch
+    - env: TOXENV=py37-dj30stable-postgres-noelasticsearch
     # allow failures against Django master
     - env: TOXENV=py37-djmaster-postgres-noelasticsearch
 

+ 5 - 1
tox.ini

@@ -2,7 +2,7 @@
 skipsdist = True
 usedevelop = True
 
-envlist = py{35,36,37}-dj{21,22,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
+envlist = py{35,36,37}-dj{21,22,22stable,30stable,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
 
 [testenv]
 install_command = pip install -e ".[testing]" -U {opts} {packages}
@@ -26,8 +26,12 @@ deps =
     dj21: Django>=2.1,<2.2
     dj22: Django>=2.2,<2.3
     dj22stable: git+https://github.com/django/django.git@stable/2.2.x#egg=Django
+    dj30stable: git+https://github.com/django/django.git@stable/3.0.x#egg=Django
+    dj30stable: git+https://github.com/wagtail/django-modelcluster.git
+    dj30stable: git+https://github.com/encode/django-rest-framework.git
     djmaster: git+https://github.com/django/django.git@master#egg=Django
     djmaster: git+https://github.com/wagtail/django-modelcluster.git
+    djmaster: git+https://github.com/encode/django-rest-framework.git
 
     postgres: psycopg2>=2.6
     mysql: mysqlclient>=1.3.7,<1.4