Skip to content

Commit

Permalink
Update django master to django main (#1251)
Browse files Browse the repository at this point in the history
  • Loading branch information
Mogost committed Mar 14, 2021
1 parent 766defb commit cd6ca0b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ env:
- 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="https://github.com/django/django/archive/master.tar.gz" IMPORT_EXPORT_TEST_TYPE=postgres
- DJANGO="https://github.com/django/django/archive/master.tar.gz" IMPORT_EXPORT_TEST_TYPE=mysql-innodb
- DJANGO="https://github.com/django/django/archive/master.tar.gz" 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
install:
- pip install -q $DJANGO
- pip install -r requirements/base.txt
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ envlist =
{py36,py37}-django22-tablib{dev,stable},
{py36,py37,py38}-django30-tablib{dev,stable},
{py36,py37,py38}-django31-tablib{dev,stable},
{py36,py37,py38}-djangomaster-tablib{dev,stable},
{py36,py37,py38}-djangomain-tablib{dev,stable},

[testenv]
commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning {toxinidir}/tests/manage.py test core
Expand All @@ -17,7 +17,7 @@ deps =
django22: Django>=2.2,<3.0
django30: Django>=3.0,<3.1
django31: Django>=3.1,<3.2
djangomaster: https://github.com/django/django/archive/master.tar.gz
djangomain: https://github.com/django/django/archive/main.tar.gz
-rrequirements/test.txt

[testenv:isort]
Expand Down

0 comments on commit cd6ca0b

Please sign in to comment.