diff --git a/AMQPStorm-2.10.4.tar.gz b/AMQPStorm-2.10.4.tar.gz
deleted file mode 100644
index 934a235..0000000
--- a/AMQPStorm-2.10.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb3d4cedd523fe4aaf0171a0ad6161d808da480ad59858698bd5e466af096586
-size 71916
diff --git a/AMQPStorm-2.10.7.tar.gz b/AMQPStorm-2.10.7.tar.gz
new file mode 100644
index 0000000..e7ba4c2
--- /dev/null
+++ b/AMQPStorm-2.10.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab2fc5a2224359866965d6d100995bf11f8897b0a7d6925ee00b9b152d024c9a
+size 73744
diff --git a/mock.patch b/mock.patch
index 58163e0..0db0770 100644
--- a/mock.patch
+++ b/mock.patch
@@ -1,75 +1,30 @@
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/basic/test_basic.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/basic/test_basic.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/basic/test_basic.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/basic/test_basic.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/basic/test_basic.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/basic/test_basic.py
 @@ -3,7 +3,7 @@ import random
  import string
  import sys
  
 -import mock
 +from unittest import mock
- from pamqp import commands
+ from pamqp import specification
  from pamqp.body import ContentBody
  from pamqp.header import ContentHeader
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/channel/test_channel_exception.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/channel/test_channel.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/channel/test_channel_exception.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/channel/test_channel_exception.py
 @@ -1,4 +1,4 @@
 -import mock
 +from unittest import mock
- from pamqp import commands
- 
- from amqpstorm import Channel
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_exception.py
-===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/channel/test_channel_exception.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_exception.py
-@@ -1,4 +1,4 @@
--import mock
-+from unittest import mock
- from pamqp import commands
+ from pamqp import specification
  
  import amqpstorm
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_frame.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/io/test_io.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/channel/test_channel_frame.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_frame.py
-@@ -1,4 +1,4 @@
--import mock
-+from unittest import mock
- from pamqp.header import ContentHeader
- from pamqp import commands
- from pamqp.body import ContentBody
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_message_handling.py
-===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/channel/test_channel_message_handling.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_message_handling.py
-@@ -1,6 +1,6 @@
- import threading
- 
--import mock
-+from unittest import mock
- from pamqp.header import ContentHeader
- from pamqp import commands
- from pamqp.body import ContentBody
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/connection/test_connection.py
-===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/connection/test_connection.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/connection/test_connection.py
-@@ -1,7 +1,7 @@
- import socket
- import threading
- 
--import mock
-+from unittest import mock
- from pamqp import exceptions as pamqp_exception
- from pamqp import frame as pamqp_frame
- from pamqp import commands
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/io/test_io.py
-===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/io/test_io.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/io/test_io.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/io/test_io.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/io/test_io.py
 @@ -1,7 +1,7 @@
  import socket
  import ssl
@@ -79,10 +34,10 @@ Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/io/test_io.py
  
  import amqpstorm.io
  from amqpstorm.exception import AMQPConnectionError
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/io/test_io_exception.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/io/test_io_exception.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/io/test_io_exception.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/io/test_io_exception.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/io/test_io_exception.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/io/test_io_exception.py
 @@ -3,7 +3,7 @@ import socket
  from errno import EINTR
  from errno import EWOULDBLOCK
@@ -92,10 +47,10 @@ Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/io/test_io_exception.py
  
  from amqpstorm import AMQPConnectionError
  from amqpstorm import compatibility
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/test_rpc.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/test_rpc.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/test_rpc.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/test_rpc.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/test_rpc.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/test_rpc.py
 @@ -1,7 +1,7 @@
  import threading
  import time
@@ -105,3 +60,48 @@ Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/test_rpc.py
  
  from amqpstorm.exception import AMQPChannelError
  from amqpstorm.rpc import Rpc
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/channel/test_channel_frame.py
+===================================================================
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/channel/test_channel_frame.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/channel/test_channel_frame.py
+@@ -1,4 +1,4 @@
+-import mock
++from unittest import mock
+ from pamqp import ContentHeader
+ from pamqp import specification
+ from pamqp.body import ContentBody
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/channel/test_channel_message_handling.py
+===================================================================
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/channel/test_channel_message_handling.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/channel/test_channel_message_handling.py
+@@ -1,6 +1,6 @@
+ import threading
+ 
+-import mock
++from unittest import mock
+ from pamqp import ContentHeader
+ from pamqp import specification
+ from pamqp.body import ContentBody
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/connection/test_connection.py
+===================================================================
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/connection/test_connection.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/connection/test_connection.py
+@@ -1,7 +1,7 @@
+ import socket
+ import threading
+ 
+-import mock
++from unittest import mock
+ from pamqp import frame as pamqp_frame
+ from pamqp import specification
+ from pamqp.specification import Basic as spec_basic
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/channel/test_channel.py
+===================================================================
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/channel/test_channel.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/channel/test_channel.py
+@@ -1,4 +1,4 @@
+-import mock
++from unittest import mock
+ from pamqp import specification
+ 
+ from amqpstorm import Channel
diff --git a/pamqp3.patch b/pamqp3.patch
index 6c4ab20..e3d08c2 100644
--- a/pamqp3.patch
+++ b/pamqp3.patch
@@ -36,10 +36,10 @@ Subject: [PATCH 1/2] Initial pamqp3 support
  setup.py                                      |  9 +--
  30 files changed, 180 insertions(+), 342 deletions(-)
 
-Index: AMQPStorm-2.10.4/LICENSE
+Index: AMQPStorm-2.10.7/LICENSE
 ===================================================================
---- AMQPStorm-2.10.4.orig/LICENSE
-+++ AMQPStorm-2.10.4/LICENSE
+--- AMQPStorm-2.10.7.orig/LICENSE
++++ AMQPStorm-2.10.7/LICENSE
 @@ -1,6 +1,6 @@
  The MIT License (MIT)
  
@@ -48,21 +48,11 @@ Index: AMQPStorm-2.10.4/LICENSE
  
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
-Index: AMQPStorm-2.10.4/README.rst
+Index: AMQPStorm-2.10.7/README.rst
 ===================================================================
---- AMQPStorm-2.10.4.orig/README.rst
-+++ AMQPStorm-2.10.4/README.rst
-@@ -9,8 +9,7 @@ Introduction
- AMQPStorm is a library designed to be consistent, stable and thread-safe.
- 
- - 100% Test Coverage!
--- Supports Python 2.7 and Python 3.3+.
--- Fully tested against Python Implementations; CPython and PyPy.
-+- Supports Python 3.6+.
- 
- Documentation
- =============
-@@ -122,5 +121,10 @@ Credits
+--- AMQPStorm-2.10.7.orig/README.rst
++++ AMQPStorm-2.10.7/README.rst
+@@ -137,5 +137,10 @@ Credits
  =======
  Special thanks to gmr (Gavin M. Roy) for creating pamqp, and in addition amqpstorm is heavily influenced by his pika and rabbitpy libraries.
  
@@ -73,10 +63,10 @@ Index: AMQPStorm-2.10.4/README.rst
 +
  .. |Version| image:: https://badge.fury.io/py/AMQPStorm.svg
    :target: https://badge.fury.io/py/AMQPStorm
-Index: AMQPStorm-2.10.4/amqpstorm/basic.py
+Index: AMQPStorm-2.10.7/amqpstorm/basic.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/basic.py
-+++ AMQPStorm-2.10.4/amqpstorm/basic.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/basic.py
++++ AMQPStorm-2.10.7/amqpstorm/basic.py
 @@ -5,7 +5,7 @@ import math
  
  from pamqp import body as pamqp_body
@@ -226,12 +216,12 @@ Index: AMQPStorm-2.10.4/amqpstorm/basic.py
              return True
          return False
  
-Index: AMQPStorm-2.10.4/amqpstorm/channel.py
+Index: AMQPStorm-2.10.7/amqpstorm/channel.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/channel.py
-+++ AMQPStorm-2.10.4/amqpstorm/channel.py
-@@ -3,7 +3,7 @@
- import logging
+--- AMQPStorm-2.10.7.orig/amqpstorm/channel.py
++++ AMQPStorm-2.10.7/amqpstorm/channel.py
+@@ -4,7 +4,7 @@ import logging
+ import threading
  import time
  
 -from pamqp import specification
@@ -239,7 +229,7 @@ Index: AMQPStorm-2.10.4/amqpstorm/channel.py
  from pamqp.header import ContentHeader
  
  from amqpstorm import compatibility
-@@ -195,7 +195,9 @@ class Channel(BaseChannel):
+@@ -197,7 +197,9 @@ class Channel(BaseChannel):
                  self.stop_consuming()
              except AMQPChannelError:
                  self.remove_consumer_tag()
@@ -250,7 +240,7 @@ Index: AMQPStorm-2.10.4/amqpstorm/channel.py
                  reply_code=reply_code,
                  reply_text=reply_text),
                  connection_adapter=self._connection
-@@ -249,7 +251,7 @@ class Channel(BaseChannel):
+@@ -251,7 +253,7 @@ class Channel(BaseChannel):
          :return:
          """
          self._confirming_deliveries = True
@@ -259,7 +249,7 @@ Index: AMQPStorm-2.10.4/amqpstorm/channel.py
          return self.rpc_request(confirm_frame)
  
      @property
-@@ -282,7 +284,7 @@ class Channel(BaseChannel):
+@@ -284,7 +286,7 @@ class Channel(BaseChannel):
          elif frame_in.name == 'Channel.Close':
              self._close_channel(frame_in)
          elif frame_in.name == 'Channel.Flow':
@@ -268,7 +258,7 @@ Index: AMQPStorm-2.10.4/amqpstorm/channel.py
          else:
              LOGGER.error(
                  '[Channel%d] Unhandled Frame: %s -- %s',
-@@ -298,7 +300,7 @@ class Channel(BaseChannel):
+@@ -300,7 +302,7 @@ class Channel(BaseChannel):
          self._exceptions = []
          self._confirming_deliveries = False
          self.set_state(self.OPENING)
@@ -277,7 +267,7 @@ Index: AMQPStorm-2.10.4/amqpstorm/channel.py
          self.set_state(self.OPEN)
  
      def process_data_events(self, to_tuple=False, auto_decode=True):
-@@ -462,7 +464,7 @@ class Channel(BaseChannel):
+@@ -464,7 +466,7 @@ class Channel(BaseChannel):
          :rtype: tuple,None
          """
          basic_deliver = self._inbound.pop(0)
@@ -286,7 +276,7 @@ Index: AMQPStorm-2.10.4/amqpstorm/channel.py
              LOGGER.warning(
                  'Received an out-of-order frame: %s was '
                  'expecting a Basic.Deliver frame',
-@@ -506,7 +508,7 @@ class Channel(BaseChannel):
+@@ -508,7 +510,7 @@ class Channel(BaseChannel):
          self.set_state(self.CLOSING)
          if not self._connection.is_closed:
              try:
@@ -295,10 +285,10 @@ Index: AMQPStorm-2.10.4/amqpstorm/channel.py
              except AMQPError:
                  pass
          self.remove_consumer_tag()
-Index: AMQPStorm-2.10.4/amqpstorm/channel0.py
+Index: AMQPStorm-2.10.7/amqpstorm/channel0.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/channel0.py
-+++ AMQPStorm-2.10.4/amqpstorm/channel0.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/channel0.py
++++ AMQPStorm-2.10.7/amqpstorm/channel0.py
 @@ -3,7 +3,7 @@
  import logging
  import platform
@@ -346,10 +336,10 @@ Index: AMQPStorm-2.10.4/amqpstorm/channel0.py
              virtual_host=self._parameters['virtual_host']
          )
          self._write_frame(open_frame)
-Index: AMQPStorm-2.10.4/amqpstorm/compatibility.py
+Index: AMQPStorm-2.10.7/amqpstorm/compatibility.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/compatibility.py
-+++ AMQPStorm-2.10.4/amqpstorm/compatibility.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/compatibility.py
++++ AMQPStorm-2.10.7/amqpstorm/compatibility.py
 @@ -1,7 +1,5 @@
  """Python 2/3 Compatibility layer."""
  
@@ -432,10 +422,10 @@ Index: AMQPStorm-2.10.4/amqpstorm/compatibility.py
          return value
  
      try:
-Index: AMQPStorm-2.10.4/amqpstorm/connection.py
+Index: AMQPStorm-2.10.7/amqpstorm/connection.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/connection.py
-+++ AMQPStorm-2.10.4/amqpstorm/connection.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/connection.py
++++ AMQPStorm-2.10.7/amqpstorm/connection.py
 @@ -8,7 +8,6 @@ from time import sleep
  from pamqp import exceptions as pamqp_exception
  from pamqp import frame as pamqp_frame
@@ -444,7 +434,7 @@ Index: AMQPStorm-2.10.4/amqpstorm/connection.py
  
  from amqpstorm import compatibility
  from amqpstorm.base import IDLE_WAIT
-@@ -323,7 +322,7 @@ class Connection(Stateful):
+@@ -324,7 +323,7 @@ class Connection(Stateful):
              return data_in[byte_count:], channel_id, frame_in
          except pamqp_exception.UnmarshalingException:
              pass
@@ -453,10 +443,10 @@ Index: AMQPStorm-2.10.4/amqpstorm/connection.py
              LOGGER.error('AMQPFrameError: %r', why, exc_info=True)
          except ValueError as why:
              LOGGER.error(why, exc_info=True)
-Index: AMQPStorm-2.10.4/amqpstorm/exchange.py
+Index: AMQPStorm-2.10.7/amqpstorm/exchange.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/exchange.py
-+++ AMQPStorm-2.10.4/amqpstorm/exchange.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/exchange.py
++++ AMQPStorm-2.10.7/amqpstorm/exchange.py
 @@ -2,7 +2,7 @@
  
  import logging
@@ -466,10 +456,10 @@ Index: AMQPStorm-2.10.4/amqpstorm/exchange.py
  
  from amqpstorm import compatibility
  from amqpstorm.base import Handler
-Index: AMQPStorm-2.10.4/amqpstorm/queue.py
+Index: AMQPStorm-2.10.7/amqpstorm/queue.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/queue.py
-+++ AMQPStorm-2.10.4/amqpstorm/queue.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/queue.py
++++ AMQPStorm-2.10.7/amqpstorm/queue.py
 @@ -2,7 +2,7 @@
  
  import logging
@@ -479,10 +469,10 @@ Index: AMQPStorm-2.10.4/amqpstorm/queue.py
  
  from amqpstorm import compatibility
  from amqpstorm.base import Handler
-Index: AMQPStorm-2.10.4/amqpstorm/tests/functional/test_generic.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/functional/test_generic.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/functional/test_generic.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/functional/test_generic.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/functional/test_generic.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/functional/test_generic.py
 @@ -175,7 +175,7 @@ class GenericTest(TestFunctionalFramewor
          # Old way
          result = payload.to_dict()
@@ -510,10 +500,10 @@ Index: AMQPStorm-2.10.4/amqpstorm/tests/functional/test_generic.py
          self.assertEqual(payload.correlation_id, correlation_id)
          self.assertIsInstance(payload.properties['app_id'], str)
          self.assertIsInstance(payload.properties['correlation_id'], str)
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/basic/test_basic_exception.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/basic/test_basic_exception.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/basic/test_basic_exception.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/basic/test_basic_exception.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/basic/test_basic_exception.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/basic/test_basic_exception.py
 @@ -1,4 +1,4 @@
 -from pamqp import specification
 +from pamqp import commands
@@ -529,14 +519,14 @@ Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/basic/test_basic_exception.py
  
          connection = FakeConnection(on_write=on_publish_return_invalid_frame)
          channel = Channel(9, connection, 0.01)
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/basic/test_basic.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/basic/test_basic.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/basic/test_basic.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/basic/test_basic.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/basic/test_basic.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/basic/test_basic.py
 @@ -4,7 +4,7 @@ import string
  import sys
  
- import mock
+ from unittest import mock
 -from pamqp import specification
 +from pamqp import commands
  from pamqp.body import ContentBody
@@ -742,12 +732,12 @@ Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/basic/test_basic.py
  
          connection = FakeConnection(on_write=on_publish_return_ack)
          channel = Channel(9, connection, 1)
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_exception.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/channel/test_channel_exception.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/channel/test_channel_exception.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_exception.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/channel/test_channel_exception.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/channel/test_channel_exception.py
 @@ -1,5 +1,5 @@
- import mock
+ from unittest import mock
 -from pamqp import specification
 +from pamqp import commands
  
@@ -775,12 +765,12 @@ Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_exception.py
              reply_code=500,
              reply_text='travis-ci'
          )
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_frame.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/channel/test_channel_frame.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/channel/test_channel_frame.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_frame.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/channel/test_channel_frame.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/channel/test_channel_frame.py
 @@ -1,6 +1,6 @@
- import mock
+ from unittest import mock
 -from pamqp import ContentHeader
 -from pamqp import specification
 +from pamqp.header import ContentHeader
@@ -874,14 +864,14 @@ Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_frame.py
          )
  
      def test_channel_unhandled_frame(self):
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_message_handling.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/channel/test_channel_message_handling.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/channel/test_channel_message_handling.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_message_handling.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/channel/test_channel_message_handling.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/channel/test_channel_message_handling.py
 @@ -1,8 +1,8 @@
  import threading
  
- import mock
+ from unittest import mock
 -from pamqp import ContentHeader
 -from pamqp import specification
 +from pamqp.header import ContentHeader
@@ -1063,12 +1053,12 @@ Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_message_handli
              consumer_tag='travis-ci-3')
          header = ContentHeader(body_size=message_len)
          body = ContentBody(value=message)
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/channel/test_channel.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/channel/test_channel.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/channel/test_channel.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/channel/test_channel.py
 @@ -1,5 +1,5 @@
- import mock
+ from unittest import mock
 -from pamqp import specification
 +from pamqp import commands
  
@@ -1131,10 +1121,10 @@ Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel.py
          # Close Channel.
          channel._close_channel(close_frame)
  
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel0/test_channel0_frame.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/channel0/test_channel0_frame.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/channel0/test_channel0_frame.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/channel0/test_channel0_frame.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/channel0/test_channel0_frame.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/channel0/test_channel0_frame.py
 @@ -1,5 +1,5 @@
  from pamqp.heartbeat import Heartbeat
 -from pamqp.specification import Connection
@@ -1142,10 +1132,10 @@ Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel0/test_channel0_frame.py
  
  import amqpstorm
  from amqpstorm import AMQPConnectionError
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel0/test_channel0.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/channel0/test_channel0.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/channel0/test_channel0.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/channel0/test_channel0.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/channel0/test_channel0.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/channel0/test_channel0.py
 @@ -1,7 +1,7 @@
  import platform
  
@@ -1155,10 +1145,10 @@ Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel0/test_channel0.py
  
  import amqpstorm
  from amqpstorm import AMQPConnectionError
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/test_compatibility.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/test_compatibility.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/test_compatibility.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/test_compatibility.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/test_compatibility.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/test_compatibility.py
 @@ -21,11 +21,6 @@ class CompatibilityTests(TestFramework):
          x = ''
          self.assertFalse(compatibility.is_integer(x))
@@ -1229,7 +1219,7 @@ Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/test_compatibility.py
  
      def test_compatibility_ssl_is_set(self):
 @@ -201,7 +159,7 @@ class CompatibilitySslTests(unittest.Tes
-             imp.reload(compatibility)
+             importlib.reload(compatibility)
  
      def test_compatibility_only_tls_v1_supported(self):
 -        """This tests mimics the behavior of Python 2.7.8 or earlier that
@@ -1237,14 +1227,14 @@ Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/test_compatibility.py
          only supported TLS v1 and SSLv23.
          """
          restore_tls_v1_2 = sys.modules['ssl'].PROTOCOL_TLSv1_2
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/connection/test_connection.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/connection/test_connection.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/connection/test_connection.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/connection/test_connection.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/connection/test_connection.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/connection/test_connection.py
 @@ -2,9 +2,10 @@ import socket
  import threading
  
- import mock
+ from unittest import mock
 +from pamqp import exceptions as pamqp_exception
  from pamqp import frame as pamqp_frame
 -from pamqp import specification
@@ -1301,20 +1291,20 @@ Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/connection/test_connection.py
  
          connection.write_frame = on_open_ok
  
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/exchange/test_exchange.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/exchange/test_exchange.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/exchange/test_exchange.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/exchange/test_exchange.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/exchange/test_exchange.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/exchange/test_exchange.py
 @@ -1,4 +1,4 @@
 -from pamqp.specification import Exchange as pamqp_exchange
 +from pamqp.commands import Exchange as pamqp_exchange
  
  from amqpstorm.channel import Channel
  from amqpstorm.channel import Exchange
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/test_tx.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/test_tx.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/test_tx.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/test_tx.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/test_tx.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/test_tx.py
 @@ -1,4 +1,4 @@
 -from pamqp import specification
 +from pamqp import commands
@@ -1404,10 +1394,10 @@ Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/test_tx.py
  
          connection = FakeConnection(on_write=on_tx)
          channel = Channel(0, connection, 0.01)
-Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/uri_connection/test_uri_connection_exception.py
+Index: AMQPStorm-2.10.7/amqpstorm/tests/unit/uri_connection/test_uri_connection_exception.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/uri_connection/test_uri_connection_exception.py
-+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/uri_connection/test_uri_connection_exception.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tests/unit/uri_connection/test_uri_connection_exception.py
++++ AMQPStorm-2.10.7/amqpstorm/tests/unit/uri_connection/test_uri_connection_exception.py
 @@ -6,18 +6,12 @@ from amqpstorm import AMQPConnectionErro
  from amqpstorm import UriConnection
  from amqpstorm import compatibility
@@ -1427,10 +1417,10 @@ Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/uri_connection/test_uri_connection_
      def test_uri_raises_on_invalid_object(self):
          self.assertRaises(AttributeError, UriConnection, None)
          self.assertRaises(AttributeError, UriConnection, {})
-Index: AMQPStorm-2.10.4/amqpstorm/tx.py
+Index: AMQPStorm-2.10.7/amqpstorm/tx.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/amqpstorm/tx.py
-+++ AMQPStorm-2.10.4/amqpstorm/tx.py
+--- AMQPStorm-2.10.7.orig/amqpstorm/tx.py
++++ AMQPStorm-2.10.7/amqpstorm/tx.py
 @@ -2,7 +2,7 @@
  
  import logging
@@ -1464,10 +1454,10 @@ Index: AMQPStorm-2.10.4/amqpstorm/tx.py
          self._tx_active = False
 -        return self._channel.rpc_request(specification.Tx.Rollback())
 +        return self._channel.rpc_request(commands.Tx.Rollback())
-Index: AMQPStorm-2.10.4/setup.cfg
+Index: AMQPStorm-2.10.7/setup.cfg
 ===================================================================
---- AMQPStorm-2.10.4.orig/setup.cfg
-+++ AMQPStorm-2.10.4/setup.cfg
+--- AMQPStorm-2.10.7.orig/setup.cfg
++++ AMQPStorm-2.10.7/setup.cfg
 @@ -2,7 +2,7 @@
  verbosity = 2
  
@@ -1477,10 +1467,10 @@ Index: AMQPStorm-2.10.4/setup.cfg
  
  [metadata]
  description-file = README.rst
-Index: AMQPStorm-2.10.4/setup.py
+Index: AMQPStorm-2.10.7/setup.py
 ===================================================================
---- AMQPStorm-2.10.4.orig/setup.py
-+++ AMQPStorm-2.10.4/setup.py
+--- AMQPStorm-2.10.7.orig/setup.py
++++ AMQPStorm-2.10.7/setup.py
 @@ -22,7 +22,7 @@ def get_version(rel_path):
  
  setup(
@@ -1499,29 +1489,11 @@ Index: AMQPStorm-2.10.4/setup.py
      extras_require={
          'management': ['requests>2'],
          'pool': ['amqpstorm-pool']
-@@ -44,17 +44,11 @@ setup(
-         'License :: OSI Approved :: MIT License',
-         'Natural Language :: English',
-         'Operating System :: OS Independent',
--        'Programming Language :: Python :: 2',
--        'Programming Language :: Python :: 2.7',
--        'Programming Language :: Python :: 3',
--        'Programming Language :: Python :: 3.4',
--        'Programming Language :: Python :: 3.5',
-         'Programming Language :: Python :: 3.6',
-         'Programming Language :: Python :: 3.7',
-         'Programming Language :: Python :: 3.8',
-         'Programming Language :: Python :: 3.9',
-         'Programming Language :: Python :: Implementation :: CPython',
--        'Programming Language :: Python :: Implementation :: PyPy',
-         'Topic :: Communications',
-         'Topic :: Internet',
-         'Topic :: Internet :: WWW/HTTP',
-Index: AMQPStorm-2.10.4/CHANGELOG.rst
+Index: AMQPStorm-2.10.7/CHANGELOG.rst
 ===================================================================
---- AMQPStorm-2.10.4.orig/CHANGELOG.rst
-+++ AMQPStorm-2.10.4/CHANGELOG.rst
-@@ -35,6 +35,11 @@ Version 2.8.5
+--- AMQPStorm-2.10.7.orig/CHANGELOG.rst
++++ AMQPStorm-2.10.7/CHANGELOG.rst
+@@ -50,6 +50,11 @@ Version 2.8.5
  -------------
  - Fixed a potential deadlock when opening a channel with a broken connection [#97] - Thanks mehdigmira.
  
diff --git a/python-amqpstorm.changes b/python-amqpstorm.changes
index 4bb1a7f..0e0e683 100644
--- a/python-amqpstorm.changes
+++ b/python-amqpstorm.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sat Dec  2 19:54:35 UTC 2023 - Dirk Müller <dmueller@suse.com>
+
+- update to 2.10.7:
+  * Fixed bug with heartbeat interval on the client not sent
+    frequently enough [#127] - Thanks Ivan Héda.
+  * Added support for Python 3.12.
+  * Fixed deprecated warning when using Python 3.11.
+  * Added support for bulk removing users with the Management
+    Api.
+  * Added support to get the Cluster Name using the Management
+    Api.
+  * Fixed ConnectionUri to default to port 5761 when using ssl
+
 -------------------------------------------------------------------
 Mon May  9 04:55:21 UTC 2022 - Markéta Machová <mmachova@suse.com>
 
@@ -64,7 +78,7 @@ Fri Jul 19 10:19:40 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.c
 Fri Jun  7 14:46:15 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
 
 - Update to 2.7.0
-  * Added support for passing your own ssl context 
+  * Added support for passing your own ssl context
   * Improved logging verbosity on connection failures
   * Fixed occasional error message when closing a SSL connection
 
@@ -143,4 +157,4 @@ Wed Feb  7 16:34:51 UTC 2018 - sean.marlow@suse.com
 -------------------------------------------------------------------
 Thu Dec  7 02:12:27 UTC 2017 - sean.marlow@suse.com
 
-- Intial release v2.2.2 
+- Intial release v2.2.2
diff --git a/python-amqpstorm.spec b/python-amqpstorm.spec
index 7657e7f..6e67f46 100644
--- a/python-amqpstorm.spec
+++ b/python-amqpstorm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-amqpstorm
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,16 +16,15 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-amqpstorm
-Version:        2.10.4
+Version:        2.10.7
 Release:        0
 Summary:        Thread-safe Python RabbitMQ Client & Management library
 License:        MIT
 URL:            https://github.com/eandersson/amqpstorm
 Source:         https://files.pythonhosted.org/packages/source/A/AMQPStorm/AMQPStorm-%{version}.tar.gz
-Patch0:         pamqp3.patch
-Patch1:         mock.patch
+Patch0:         mock.patch
+Patch1:         pamqp3.patch
 BuildRequires:  %{python_module pamqp >= 3.0}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module requests}
@@ -48,8 +47,7 @@ Tested against CPython, PyPy and Pyston.
 When using a SSL connection, TLSv1 or higher is required.
 
 %prep
-%setup -q -n AMQPStorm-%{version}
-%autopatch -p1
+%autosetup -p1 -n AMQPStorm-%{version}
 
 %build
 export LANG="en_US.UTF8"