bump up version + add test for psutil versionrelease-3.1.1

3 files changed, 7 insertions, 2 deletions

diff --git a/HISTORY.rst b/HISTORY.rst
index 65fedf91..12b985d1 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,6 @@
 Bug tracker at https://github.com/giampaolo/psutil/issues
 
-3.1.1 - XXXX-XX-XX
+3.1.1 - 2015-07-15
 ==================
 
 **Bug fixes**
diff --git a/psutil/__init__.py b/psutil/__init__.py
index baa74ae1..1444425b 100644
--- a/psutil/__init__.py
+++ b/psutil/__init__.py
@@ -158,7 +158,7 @@ __all__ = [
 ]
 __all__.extend(_psplatform.__extra__all__)
 __author__ = "Giampaolo Rodola'"
-__version__ = "3.1.0"
+__version__ = "3.1.1"
 version_info = tuple([int(num) for num in __version__.split('.')])
 AF_LINK = _psplatform.AF_LINK
 _TOTAL_PHYMEM = None
diff --git a/test/test_psutil.py b/test/test_psutil.py
index 3df30203..3b2e3587 100644
--- a/test/test_psutil.py
+++ b/test/test_psutil.py
@@ -2772,6 +2772,10 @@ class TestMisc(unittest.TestCase):
         for name in psutil.__all__:
             self.assertIn(name, dir_psutil)
 
+    def test_version(self):
+        self.assertEqual('.'.join([str(x) for x in psutil.version_info]),
+                         psutil.__version__)
+
     def test_memoize(self):
         from psutil._common import memoize
 
@@ -2854,6 +2858,7 @@ class TestMisc(unittest.TestCase):
         setup_py = os.path.realpath(os.path.join(here, '..', 'setup.py'))
         module = imp.load_source('setup', setup_py)
         self.assertRaises(SystemExit, module.setup)
+        self.assertEqual(module.get_version(), psutil.__version__)
 
     def test_ad_on_process_creation(self):
         # We are supposed to be able to instantiate Process also in case