don't test Django main branch with python36,37

django-import-export · Apr 16, 2021 · 1da8f7c · 1da8f7c
1 parent 8e6c0e6
commit 1da8f7c
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,27 +14,40 @@ env:
     - IMPORT_EXPORT_MYSQL_USER=root
     - IMPORT_EXPORT_MYSQL_PASSWORD=
   matrix:
-    - DJANGO="Django==2.0.*" IMPORT_EXPORT_TEST_TYPE=postgres
-    - DJANGO="Django==2.0.*" IMPORT_EXPORT_TEST_TYPE=mysql-innodb
-    - DJANGO="Django==2.0.*" IMPORT_EXPORT_TEST_TYPE=sqlite
-    - DJANGO="Django==2.1.*" IMPORT_EXPORT_TEST_TYPE=postgres
-    - DJANGO="Django==2.1.*" IMPORT_EXPORT_TEST_TYPE=mysql-innodb
-    - DJANGO="Django==2.1.*" IMPORT_EXPORT_TEST_TYPE=sqlite
-    - DJANGO="Django==2.2.*" IMPORT_EXPORT_TEST_TYPE=postgres
-    - DJANGO="Django==2.2.*" IMPORT_EXPORT_TEST_TYPE=mysql-innodb
-    - DJANGO="Django==2.2.*" IMPORT_EXPORT_TEST_TYPE=sqlite
-    - DJANGO="Django==3.0.*" IMPORT_EXPORT_TEST_TYPE=postgres
-    - DJANGO="Django==3.0.*" IMPORT_EXPORT_TEST_TYPE=mysql-innodb
-    - DJANGO="Django==3.0.*" IMPORT_EXPORT_TEST_TYPE=sqlite
-    - DJANGO="Django==3.1.*" IMPORT_EXPORT_TEST_TYPE=postgres
-    - DJANGO="Django==3.1.*" IMPORT_EXPORT_TEST_TYPE=mysql-innodb
-    - DJANGO="Django==3.1.*" IMPORT_EXPORT_TEST_TYPE=sqlite
-    - DJANGO="Django==3.2.*" IMPORT_EXPORT_TEST_TYPE=postgres
-    - DJANGO="Django==3.2.*" IMPORT_EXPORT_TEST_TYPE=mysql-innodb
-    - DJANGO="Django==3.2.*" IMPORT_EXPORT_TEST_TYPE=sqlite
-    - DJANGO="https://github.com/django/django/archive/main.tar.gz" IMPORT_EXPORT_TEST_TYPE=postgres
-    - DJANGO="https://github.com/django/django/archive/main.tar.gz" IMPORT_EXPORT_TEST_TYPE=mysql-innodb
-    - DJANGO="https://github.com/django/django/archive/main.tar.gz" IMPORT_EXPORT_TEST_TYPE=sqlite
+    include:
+      - DJANGO="Django==2.0.*" IMPORT_EXPORT_TEST_TYPE=postgres
+      - DJANGO="Django==2.0.*" IMPORT_EXPORT_TEST_TYPE=mysql-innodb
+      - DJANGO="Django==2.0.*" IMPORT_EXPORT_TEST_TYPE=sqlite
+      - DJANGO="Django==2.1.*" IMPORT_EXPORT_TEST_TYPE=postgres
+      - DJANGO="Django==2.1.*" IMPORT_EXPORT_TEST_TYPE=mysql-innodb
+      - DJANGO="Django==2.1.*" IMPORT_EXPORT_TEST_TYPE=sqlite
+      - DJANGO="Django==2.2.*" IMPORT_EXPORT_TEST_TYPE=postgres
+      - DJANGO="Django==2.2.*" IMPORT_EXPORT_TEST_TYPE=mysql-innodb
+      - DJANGO="Django==2.2.*" IMPORT_EXPORT_TEST_TYPE=sqlite
+      - DJANGO="Django==3.0.*" IMPORT_EXPORT_TEST_TYPE=postgres
+      - DJANGO="Django==3.0.*" IMPORT_EXPORT_TEST_TYPE=mysql-innodb
+      - DJANGO="Django==3.0.*" IMPORT_EXPORT_TEST_TYPE=sqlite
+      - DJANGO="Django==3.1.*" IMPORT_EXPORT_TEST_TYPE=postgres
+      - DJANGO="Django==3.1.*" IMPORT_EXPORT_TEST_TYPE=mysql-innodb
+      - DJANGO="Django==3.1.*" IMPORT_EXPORT_TEST_TYPE=sqlite
+      - DJANGO="Django==3.2.*" IMPORT_EXPORT_TEST_TYPE=postgres
+      - DJANGO="Django==3.2.*" IMPORT_EXPORT_TEST_TYPE=mysql-innodb
+      - DJANGO="Django==3.2.*" IMPORT_EXPORT_TEST_TYPE=sqlite
+      - python: "3.8"
+        env: DJANGO="https://github.com/django/django/archive/main.tar.gz" IMPORT_EXPORT_TEST_TYPE=postgres
+      - python: "3.8"
+        env: DJANGO="https://github.com/django/django/archive/main.tar.gz" IMPORT_EXPORT_TEST_TYPE=mysql-innodb
+      - python: "3.8"
+        env: DJANGO="https://github.com/django/django/archive/main.tar.gz" IMPORT_EXPORT_TEST_TYPE=sqlite
+
+    allow_failures:
+      - python: "3.8"
+        env: DJANGO="https://github.com/django/django/archive/main.tar.gz" IMPORT_EXPORT_TEST_TYPE=postgres
+      - python: "3.8"
+        env: DJANGO="https://github.com/django/django/archive/main.tar.gz" IMPORT_EXPORT_TEST_TYPE=mysql-innodb
+      - python: "3.8"
+        env: DJANGO="https://github.com/django/django/archive/main.tar.gz" IMPORT_EXPORT_TEST_TYPE=sqlite
+
 install:
   - pip install -q $DJANGO
   - pip install -r requirements/base.txt

diff --git a/tox.ini b/tox.ini
@@ -2,11 +2,11 @@
 envlist =
        {py36,py37}-django20-tablib{dev,stable}
        {py36,py37}-django21-tablib{dev,stable}
-       {py36,py37}-django22-tablib{dev,stable}
-       {py36,py37,py38}-django30-tablib{dev,stable}
-       {py36,py37,py38}-django31-tablib{dev,stable}
-       {py36,py37,py38}-django32-tablib{dev,stable}
-       {py36,py37,py38}-djangomain-tablib{dev,stable}
+       {py36,py37,py38,py39}-django22-tablib{dev,stable}
+       {py36,py37,py38,py39}-django30-tablib{dev,stable}
+       {py36,py37,py38,py39}-django31-tablib{dev,stable}
+       {py36,py37,py38,py39}-django32-tablib{dev,stable}
+       {py38,py39}-djangomain-tablib{dev,stable}
 
 [testenv]
 commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning {toxinidir}/tests/manage.py test core