diff options
| -rw-r--r-- | releasenotes/notes/django-2-0-support-807980866ca16b77.yaml | 5 | ||||
| -rw-r--r-- | requirements-dev.txt | 3 | ||||
| -rw-r--r-- | requirements-prod.txt | 3 | ||||
| -rw-r--r-- | tox.ini | 5 |
4 files changed, 13 insertions, 3 deletions
diff --git a/releasenotes/notes/django-2-0-support-807980866ca16b77.yaml b/releasenotes/notes/django-2-0-support-807980866ca16b77.yaml new file mode 100644 index 0000000..5c20673 --- /dev/null +++ b/releasenotes/notes/django-2-0-support-807980866ca16b77.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + `Django 2.0 <https://docs.djangoproject.com/en/2.0/releases/2.0/>`_ is now + supported. diff --git a/requirements-dev.txt b/requirements-dev.txt index 8bad8f0..f4ad751 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,4 +1,5 @@ -Django>=1.11,<2.0 +Django>=1.11,<2.1; python_version >= '3.4' +Django>=1.11,<2.0; python_version < '3.0' djangorestframework>=3.4,<3.9 django-filter>=1.0,<1.2 -r requirements-test.txt diff --git a/requirements-prod.txt b/requirements-prod.txt index c30688c..e7a7535 100644 --- a/requirements-prod.txt +++ b/requirements-prod.txt @@ -1,4 +1,5 @@ -Django>=1.11,<2.0 +Django>=1.11,<2.1; python_version >= '3.4' +Django>=1.11,<2.0; python_version < '3.0' djangorestframework>=3.4,<3.9 django-filter>=1.0,<1.2 psycopg2>=2.7,<2.8 @@ -1,6 +1,6 @@ [tox] minversion = 2.0 -envlist = pep8,docs,py{27,34,35,36}-django111 +envlist = pep8,docs,py{27,34}-django111,py{35,36}-django{111,20} skipsdist = True [testenv] @@ -9,6 +9,9 @@ deps = django111: django>=1.11,<2.0 django111: djangorestframework>=3.6,<3.9 django111: django-filter>=1.0,<1.2 + django20: django>=2.0,<2.1 + django20: djangorestframework>=3.7,<3.9 + django20: django-filter>=1.1,<1.2 setenv = DJANGO_SETTINGS_MODULE = patchwork.settings.dev PYTHONDONTWRITEBYTECODE = 1 |