version bump with release notes

teepark · Dec 30, 2014 · e7e4d42 · e7e4d42
1 parent d7aebc8
commit e7e4d42
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -147,3 +147,7 @@
 
 2.1.13 (11/19/2014)
     - updated the zmq patching code to match changes in pyzmq 
+
+2.2.0 (12/30/2014)
+    - fixed ssl emulation with httplib for python 2.7.3 (I believe this fixes
+      it up through 2.7.8, but 2.7.9 is still very broken)
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -47,9 +47,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.1'
+version = '2.2'
 # The full version, including alpha/beta/rc tags.
-release = '2.1.13'
+release = '2.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/greenhouse/__init__.py b/greenhouse/__init__.py
@@ -13,7 +13,7 @@
 from greenhouse.emulation import *
 
 
-VERSION = (2, 1, 13, '')
+VERSION = (2, 2, 0, '')
 
 __version__ = ".".join(filter(None, (str(x) for x in VERSION)))
 

diff --git a/setup.py b/setup.py
@@ -1,11 +1,10 @@
 #!/usr/bin/env python
 # vim: fileencoding=utf8:et:sw=4:ts=8:sts=4
 
-import os
 from setuptools import setup
 
 
-VERSION = (2, 1, 13, "")
+VERSION = (2, 2, 0, "")
 
 setup(
     name="greenhouse",