Merge pull request #150 from PoByBolek/distutils-deprecation-warning

Prevent deprecation warnings for distutils StrictVersion when running with setuptools or Python >= 3.10

django_dynamic_fixture/__init__.py

@@ -23,8 +23,8 @@
 __version__ = '3.1.2'
 
 
-if not django_greater_than('1.10'):
-    warnings.warn("DDF supports oficially only Django 1.11 or higher.", DeprecationWarning)
+if not django_greater_than(1, 10):
+    warnings.warn("DDF officially supports only Django 1.11 or higher.", DeprecationWarning)
 
 
 LOOKUP_SEP = '__'
@@ -213,4 +213,3 @@ def teach(model: typing.Type[INSTANCE_TYPE], ddf_lesson=None, **kwargs):
         exec(hack_to_avoid_py2_syntax_errors)
     except (ImportError, SyntaxError) as e:
         pass
-

django_dynamic_fixture/django_helper.py

@@ -2,9 +2,6 @@
 """
 Module to wrap dirty stuff of django core.
 """
-import re
-from distutils.version import StrictVersion
-
 import django
 from django.apps import apps
 from django.db import models  # noqa
@@ -18,11 +15,9 @@
     from django.core.exceptions import FieldDoesNotExist
 
 
+def django_greater_than(major, minor=0):
+    return django.VERSION[:2] > (major, minor)
 
-def django_greater_than(version):
-    # Avoid StrictVersion errors with versions like 1.8c1
-    DJANGO_VERSION = re.match(r"\d\.\d\d?", django.get_version()).group(0)
-    return StrictVersion(DJANGO_VERSION) >= StrictVersion(version)
 
 # Apps
 def get_apps(application_labels=[], exclude_application_labels=[]):