Fix Django 2.1.1

klen · Sep 28, 2018 · eaad608 · eaad608
1 parent 3489d88
commit eaad608
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/README.rst b/README.rst
@@ -56,11 +56,12 @@ documentation enhancements and/or fixes are awesome and most welcome.**
 Requirements
 =============
 
-- Django (1.10, 1.11, 2.0) for Django ORM support;
+- Django (1.11, 2.1) for Django ORM support;
 - Faker >= 0.7.3
 - Flask-SQLALchemy for SQLAlchemy ORM support and integration as Flask application;
 - Mongoengine for Mongoengine ODM support;
 - SQLAlchemy for SQLAlchemy ORM support;
+- Peewee ORM support;
 - fake-factory >= 0.5.0
 - faker == 0.7.3
 - python 2.7 or 3.6+

diff --git a/mixer/backend/django.py b/mixer/backend/django.py
@@ -229,7 +229,7 @@ def _get_value(self, name, value, field=None):
             if callable(value):
                 return self._get_value(name, value(), field)
 
-            if field:
+            if field and not isinstance(field.scheme, models.ForeignKey):
                 value = field.scheme.to_python(value)
 
         return name, value

diff --git a/requirements-tests.txt b/requirements-tests.txt
@@ -1,11 +1,11 @@
-Django              >= 1.10.3
+Django              >= 2.1.1
 Flask               >= 0.11.1
 Marshmallow         >= 2.10.3
 SQLAlchemy          >= 1.1.4
 flask-sqlalchemy    >= 2.1
 ipdb                >= 0.10.3
 mongoengine         >= 0.10.1
-peewee              >= 2.8.5
+peewee              >= 3.7.0
 pony                >= 0.7
 psycopg2            >= 2.7.5
 pytest              >= 3.0.4

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-envlist = py27-d{10,11},
-          py36-d{11,20},
+envlist = py27-d11,
+          py36-d{11,21},
           cov
 skip_missing_interpreters = false
 
@@ -26,34 +26,28 @@ deps =
     peewee>=2.7.5
     pytest
 
-[testenv:py27-d10]
-basepython = python2.7
-deps =
-    django==1.10.8
-    {[testenv]deps}
-
 [testenv:py27-d11]
 basepython = python2.7
 deps =
-    django==1.11.8
+    django==1.11.15
     {[testenv]deps}
 
 [testenv:py36-d11]
 basepython = python3.6
 deps =
-    django==1.11.8
+    django==1.11.15
     {[testenv]deps}
 
-[testenv:py36-d20]
+[testenv:py36-d21]
 basepython = python3.6
 deps =
-    django==2.0rc1
+    django==2.1.1
     {[testenv]deps}
 
 [testenv:cov]
 deps =
     coverage
-    django==1.10.3
+    django==1.11.15
     pony
     {[testenv]deps}