From bfe2dafc76d7103f1e381de661549ebbf521781c Mon Sep 17 00:00:00 2001 From: Paulo Cheque Date: Tue, 5 Sep 2023 17:19:56 -0300 Subject: [PATCH] Removed obsolete code (#159) --- django_dynamic_fixture/__init__.py | 4 ++-- django_dynamic_fixture/global_settings.py | 7 +------ django_dynamic_fixture/tests/test_ddf.py | 4 ---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/django_dynamic_fixture/__init__.py b/django_dynamic_fixture/__init__.py index 019937b..e78abca 100644 --- a/django_dynamic_fixture/__init__.py +++ b/django_dynamic_fixture/__init__.py @@ -21,8 +21,8 @@ __version__ = '4.0.0' -if not django_greater_than(1, 10): - warnings.warn("DDF officially supports only Django 1.11 or higher.", DeprecationWarning) +if not django_greater_than(4, 0): + warnings.warn("DDF 4.* officially supports only Django 4 or higher.", DeprecationWarning) LOOKUP_SEP = '__' diff --git a/django_dynamic_fixture/global_settings.py b/django_dynamic_fixture/global_settings.py index 29bc83c..846f6a9 100644 --- a/django_dynamic_fixture/global_settings.py +++ b/django_dynamic_fixture/global_settings.py @@ -8,12 +8,7 @@ import warnings from django.conf import settings -try: - # Django 2.0 - from django.urls import get_mod_func -except ImportError: - # Django <= 1.11 - from django.core.urlresolvers import get_mod_func +from django.urls import get_mod_func try: from importlib import import_module except ImportError: diff --git a/django_dynamic_fixture/tests/test_ddf.py b/django_dynamic_fixture/tests/test_ddf.py index 5adadac..4947d0a 100644 --- a/django_dynamic_fixture/tests/test_ddf.py +++ b/django_dynamic_fixture/tests/test_ddf.py @@ -317,10 +317,6 @@ def test_new_create_with_min_depth_2(self): class NewDealWithInheritanceTest(DDFTestCase): - @pytest.mark.skipif(django.VERSION > (3, 2), reason="Not supported on Django 3.2+") - def test_new_must_not_raise_an_error_if_model_is_abstract(self): - self.ddf.new(ModelAbstract) # it does not raise an exceptions - def test_get_must_raise_an_error_if_model_is_abstract(self): with pytest.raises(InvalidModelError): self.ddf.get(ModelAbstract)