Updated Django to 1.11

pawelad · Apr 4, 2017 · 299846c · 299846c
1 parent ad28719
commit 299846c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ locally.
 
 ## Tests
 Package was tested with the help of `py.test` and `tox` on Python 3.4, 3.5
-and 3.6 with Django 1.10 and Django REST Framework 3.6 (see `tox.ini`).
+and 3.6 with Django 1.11 and Django REST Framework 3.6 (see `tox.ini`).
 
 Code coverage is available at [Coveralls][coveralls].
 

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -5,7 +5,6 @@ coveralls>=1.1
 flake8>=3.3.0
 pytest>=3.0.7
 pytest-django>=3.1.2
-pytest-factoryboy>=1.3.1
-pytest-mock>=1.5.0
+pytest-mock>=1.6.0
 pytest-pythonpath>=0.7.1
 tox>=2.6.0
diff --git a/requirements/prod.txt b/requirements/prod.txt
@@ -1,4 +1,4 @@
-Django>=1.10.6,<1.11
+Django>=1.11,<2.0
 djangorestframework>=3.6.2
 
 celery[redis]>=4.0.2

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{34,35,36}-django10,py36-flake8
+envlist = py{34,35,36},py36-flake8
 skipsdist = true
 
 [testenv]