summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/changelog.rst9
-rw-r--r--factory/__init__.py2
2 files changed, 9 insertions, 2 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8e8034a..c97f735 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -21,7 +21,7 @@ ChangeLog
- Remove :meth:`~factory.Factory.set_building_function` / :meth:`~factory.Factory.set_creation_function`
-1.2.0 (current)
+1.3.0 (current)
---------------
*New:*
@@ -44,6 +44,13 @@ The following features have been deprecated and will be removed in an upcoming r
- Implicit associated class discovery is no longer supported, you must set the :attr:`~factory.Factory.FACTORY_FOR`
attribute on all :class:`~factory.Factory` subclasses
+1.2.0 (09/08/2012)
+------------------
+
+*New:*
+
+ - Add :class:`~factory.CircularSubFactory` to solve circular dependencies between factories
+
1.1.5 (09/07/2012)
------------------
diff --git a/factory/__init__.py b/factory/__init__.py
index a2a9f9a..a07ffa1 100644
--- a/factory/__init__.py
+++ b/factory/__init__.py
@@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-__version__ = '1.2.0'
+__version__ = '1.3.0-dev'
__author__ = 'Raphaƫl Barrois <raphael.barrois+fboy@polytechnique.org>'
from .base import (