From 908b2cda43eff9ab7a5045b6f6dfe3a718fb9afd Mon Sep 17 00:00:00 2001
From: JP <jpellerin@gmail.com>
Date: Wed, 12 Sep 2012 16:00:09 -0400
Subject: Correct nose.__version__ and bump overall version to 1.2.1

---
 CHANGELOG        | 4 ++++
 doc/conf.py      | 2 +-
 nose/__init__.py | 2 +-
 setup.py         | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4437f9b..b4584e6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+1.2.1
+
+- Correct nose.__version__ (#549). Thanks to Chris Withers for the bug report.
+
 1.2.0
 
 - Fixed issue where plugins included with `addplugins` keyword could
diff --git a/doc/conf.py b/doc/conf.py
index 6c7c262..5623175 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -57,7 +57,7 @@ copyright = u'2009, Jason Pellerin'
 # The short X.Y version.
 version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0'
+release = '1.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/nose/__init__.py b/nose/__init__.py
index f713e4f..85a9750 100644
--- a/nose/__init__.py
+++ b/nose/__init__.py
@@ -4,7 +4,7 @@ from nose.exc import SkipTest, DeprecatedTest
 from nose.tools import with_setup
 
 __author__ = 'Jason Pellerin'
-__versioninfo__ = (1, 1, 3)
+__versioninfo__ = (1, 2, 1)
 __version__ = '.'.join(map(str, __versioninfo__))
 
 __all__ = [
diff --git a/setup.py b/setup.py
index 937343a..43c3e4a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 import sys
 import os
 
-VERSION = '1.2.0'
+VERSION = '1.2.1'
 py_vers_tag = '-%s.%s' % sys.version_info[:2]
 
 test_dirs = ['functional_tests', 'unit_tests', os.path.join('doc','doc_tests'), 'nose']
-- 
cgit v1.2.1