From 92513f43b31ff30eae3b0a443bdde1d5936a9670 Mon Sep 17 00:00:00 2001 From: James Murty Date: Fri, 19 May 2017 14:35:24 +1000 Subject: [PATCH] Use latest DDF with setting no need for our custom version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Recent versions of django-dynamic-fixture support wildcards in the `DDF_IGNORE_FIELDS` setting which makes it easy to specify that all fields ending with `_ptr` – as used by django-polymorphic – should be ignored when populating field data. --- icekit_events/tests/settings.py | 1 + setup.py | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/icekit_events/tests/settings.py b/icekit_events/tests/settings.py index 51b852b..c83ae31 100644 --- a/icekit_events/tests/settings.py +++ b/icekit_events/tests/settings.py @@ -71,6 +71,7 @@ STATIC_ROOT = os.path.join(BASE_DIR, 'static') DDF_FILL_NULLABLE_FIELDS = False +DDF_IGNORE_FIELDS = ['*_ptr'] # Ignore django-polymorphic pointer fields FLUENT_PAGES_TEMPLATE_DIR = os.path.join(BASE_DIR, '..', 'templates') TEMPLATES = [ diff --git a/setup.py b/setup.py index 9e75e9f..1607869 100644 --- a/setup.py +++ b/setup.py @@ -65,11 +65,12 @@ 'fluentevent': ['django-fluent-contents'], 'postgres': ['psycopg2'], 'test': [ - 'coverage', 'django-nose', 'nose-progressive', 'django-webtest', 'WebTest', - # TODO Specific version of django-dynamic-fixture is necessary to avoid - # AttributeError: can't set attribute` failures on polymorphic models. - # See https://github.com/paulocheque/django-dynamic-fixture/pull/59 - 'django-dynamic-fixture==1.9.0+0.caeb3427399edd3b0d589516993c7da55e0de560.ixc', + 'coverage', + 'django-dynamic-fixture', + 'django-nose', + 'django-webtest', + 'nose-progressive', + 'WebTest', ] }, setup_requires=['setuptools_scm'],