summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/changelog.rst5
-rw-r--r--factory/__init__.py2
-rwxr-xr-xsetup.py30
3 files changed, 19 insertions, 18 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 25d6a06..3e07a82 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -3,8 +3,8 @@ ChangeLog
.. _v2.2.0:
-2.2.0 (current)
----------------
+2.2.0 (2013-09-24)
+------------------
*Bugfix:*
@@ -13,6 +13,7 @@ ChangeLog
- Properly handle sequences within object inheritance chains.
If FactoryA inherits from FactoryB, and their associated classes share the same link,
sequence counters will be shared (:issue:`93`)
+ - Properly handle nested :class:`~factory.SubFactory` overrides
*New:*
diff --git a/factory/__init__.py b/factory/__init__.py
index a71fea5..280ab11 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__ = '2.1.2'
+__version__ = '2.2.0'
__author__ = 'Raphaƫl Barrois <raphael.barrois+fboy@polytechnique.org>'
diff --git a/setup.py b/setup.py
index 1b49342..1154061 100755
--- a/setup.py
+++ b/setup.py
@@ -50,21 +50,21 @@ setup(
'mock',
],
classifiers=[
- 'Development Status :: 5 - Production/Stable',
- 'Intended Audience :: Developers',
- 'Framework :: Django',
- 'License :: OSI Approved :: MIT License',
- 'Operating System :: OS Independent',
- 'Programming Language :: Python',
- 'Programming Language :: Python :: 2',
- 'Programming Language :: Python :: 2.6',
- 'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.2',
- 'Programming Language :: Python :: 3.3',
- 'Programming Language :: Python :: Implementation :: PyPy',
- 'Topic :: Software Development :: Testing',
- 'Topic :: Software Development :: Libraries :: Python Modules'
+ "Development Status :: 5 - Production/Stable",
+ "Intended Audience :: Developers",
+ "Framework :: Django",
+ "License :: OSI Approved :: MIT License",
+ "Operating System :: OS Independent",
+ "Programming Language :: Python",
+ "Programming Language :: Python :: 2",
+ "Programming Language :: Python :: 2.6",
+ "Programming Language :: Python :: 2.7",
+ "Programming Language :: Python :: 3",
+ "Programming Language :: Python :: 3.2",
+ "Programming Language :: Python :: 3.3",
+ "Programming Language :: Python :: Implementation :: PyPy",
+ "Topic :: Software Development :: Testing",
+ "Topic :: Software Development :: Libraries :: Python Modules"
],
test_suite='tests',
test_loader=test_loader,