Releasing 1.5.0

CHANGELOG.rst

@@ -1,13 +1,14 @@
 Changelog
 -------------
 
-Version 1.5.0 RC1
+Version 1.5.0
 -------------
 - Added support for Channel.Tx (Server local transactions). [#27]
 - Added support for Heartbeat interval 0 (disabled). [#26]
+- Added Python implementation to platform string, e.g. Python 2.7.0 (Jython).
 - Fixed Jython bug. [#25]
 - Fixed incorrect log line for the Connection and Channel Context Manager.
-- Removed socket keepalive option.
+- Removed TCP Keepalive.
 
 Version 1.4.1
 -------------

amqpstorm/__init__.py

@@ -1,5 +1,5 @@
 """AMQP-Storm."""
-__version__ = '1.5.0-RC1'  # noqa
+__version__ = '1.5.0'  # noqa
 __author__ = 'eandersson'  # noqa
 
 import logging

amqpstorm/channel0.py

@@ -132,32 +132,32 @@ def _send_start_ok_frame(self, frame_in):
             self._connection.exceptions.append(exception)
             return
         credentials = self._plain_credentials()
-        frame = pamqp_connection.StartOk(
+        start_ok_frame = pamqp_connection.StartOk(
             mechanism=AUTH_MECHANISM,
             client_properties=self._client_properties(),
             response=credentials,
             locale=LOCALE)
-        self._write_frame(frame)
+        self._write_frame(start_ok_frame)
 
     def _send_tune_ok_frame(self):
         """Send Tune OK frame.
 
         :return:
         """
-        frame = pamqp_connection.TuneOk(channel_max=MAX_CHANNELS,
-                                        frame_max=FRAME_MAX,
-                                        heartbeat=self._heartbeat)
-        self._write_frame(frame)
+        tune_ok_frame = pamqp_connection.TuneOk(channel_max=MAX_CHANNELS,
+                                                frame_max=FRAME_MAX,
+                                                heartbeat=self._heartbeat)
+        self._write_frame(tune_ok_frame)
 
     def _send_open_connection(self):
         """Send Open Connection frame.
 
         :return:
         """
-        frame = pamqp_connection.Open(
+        open_frame = pamqp_connection.Open(
             virtual_host=self.parameters['virtual_host']
         )
-        self._write_frame(frame)
+        self._write_frame(open_frame)
 
     def _set_connection_state(self, state):
         """Set Connection state.
@@ -184,7 +184,8 @@ def _client_properties():
         """
         return {
             'product': 'AMQP-Storm',
-            'platform': 'Python %s' % platform.python_version(),
+            'platform': 'Python %s (%s)' % (platform.python_version(),
+                                            platform.python_implementation()),
             'capabilities': {
                 'basic.nack': True,
                 'connection.blocked': True,

amqpstorm/tests/unit/channel0_tests.py

@@ -27,7 +27,8 @@ def test_channel0_client_properties(self):
         result = channel._client_properties()
 
         information = 'See https://github.com/eandersson/amqpstorm'
-        python_version = 'Python %s' % platform.python_version()
+        python_version = 'Python %s (%s)' % (platform.python_version(),
+                                             platform.python_implementation())
 
         self.assertIsInstance(result, dict)
         self.assertTrue(result['capabilities']['authentication_failure_close'])

amqpstorm/tests/unit/heartbeat_tests.py

@@ -119,7 +119,7 @@ def send_heartbeat():
             heartbeat.register_read()
             self.assertTrue(heartbeat._check_for_life_signs())
         self.assertEqual(self.beats, 10)
-        
+
         heartbeat.stop()
 
     def test_heartbeat_threshold_reset(self):
@@ -197,5 +197,5 @@ def send_heartbeat():
         self.assertTrue(heartbeat._check_for_life_signs())
 
         self.assertEqual(heartbeat._threshold, 0)
-        
+
         heartbeat.stop()

setup.py

@@ -5,7 +5,7 @@
 """
 
 setup(name='AMQPStorm',
-      version='1.5.0-RC1',
+      version='1.5.0',
       description='Thread-safe Python RabbitMQ Client Library based on pamqp.',
       long_description=long_description,
       author='Erik Olof Gunnar Andersson',