summaryrefslogtreecommitdiff
path: root/docs/changelog.rst
diff options
context:
space:
mode:
authorRaphaël Barrois <raphael.barrois@polytechnique.org>2015-05-20 23:24:45 +0200
committerRaphaël Barrois <raphael.barrois@polytechnique.org>2015-05-20 23:24:45 +0200
commitfa6d60d17ddb7b70c6bc2337d901ef8cc924e67b (patch)
tree83fb2851ab7dd64a54732159d3099488193aac02 /docs/changelog.rst
parent536ac1b0fe7c4a04ad144022d6394b994feccdfd (diff)
downloadfactory-boy-fa6d60d17ddb7b70c6bc2337d901ef8cc924e67b.tar
factory-boy-fa6d60d17ddb7b70c6bc2337d901ef8cc924e67b.tar.gz
Add Meta.rename to handle name conflicts (See #206).
Define ``Meta.rename = {'attrs': 'attributes'}`` if your model expects a ``attributes`` kwarg but you can't define it since it's already reserved by the ``Factory`` class.
Diffstat (limited to 'docs/changelog.rst')
-rw-r--r--docs/changelog.rst9
1 files changed, 9 insertions, 0 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8f63567..cd5d281 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,15 @@
ChangeLog
=========
+.. _v2.6.0:
+
+2.6.0 (XXXX-XX-XX)
+------------------
+
+*New:*
+
+ - Add :attr:`factory.FactoryOptions.rename` to help handle conflicting names (:issue:`206`)
+
.. _v2.5.2:
2.5.2 (2015-04-21)