diff --git a/.travis.yml b/.travis.yml index 5469ececc..ea697d425 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,9 +25,9 @@ env: - DJANGO_ENV="django>=2.1,<2.2" DB=sqlite - DJANGO_ENV="django>=2.1,<2.2" DB=postgres - DJANGO_ENV="django>=2.1,<2.2" DB=mysql - - DJANGO_ENV="django==2.2rc1" DB=sqlite - - DJANGO_ENV="django==2.2rc1" DB=postgres - - DJANGO_ENV="django==2.2rc1" DB=mysql + - DJANGO_ENV="django>=2.2,<3.0" DB=sqlite + - DJANGO_ENV="django>=2.2,<3.0" DB=postgres + - DJANGO_ENV="django>=2.2,<3.0" DB=mysql matrix: allow_failures: @@ -42,11 +42,11 @@ matrix: - python: "3.4" env: DJANGO_ENV="django>=2.1,<2.2" DB=mysql - python: "3.4" - env: DJANGO_ENV="django==2.2rc1" DB=sqlite + env: DJANGO_ENV="django>=2.2,<3.0" DB=sqlite - python: "3.4" - env: DJANGO_ENV="django==2.2rc1" DB=postgres + env: DJANGO_ENV="django>=2.2,<3.0" DB=postgres - python: "3.4" - env: DJANGO_ENV="django==2.2rc1" DB=mysql + env: DJANGO_ENV="django>=2.2,<3.0" DB=mysql install: - if [[ $DB == "mysql" ]]; then sudo apt-get install -qq libmysqlclient-dev && pip install mysqlclient; fi diff --git a/tox.ini b/tox.ini index ef0922935..9f829a636 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ deps = pipenv django20: Django>=2.0,<2.1 django21: Django>=2.1,<2.2 - django22: Django==2.2rc1 + django22: Django>=2.2,<3.0 setenv = PYTHONPATH = {toxinidir}:{toxinidir} passenv = PYTHONPATH