diff options
| -rw-r--r-- | .zuul.yaml | 34 | ||||
| -rw-r--r-- | lower-constraints.txt | 1 | ||||
| -rw-r--r-- | oslo_messaging/_drivers/amqp1_driver/controller.py | 6 | ||||
| -rw-r--r-- | oslo_messaging/rpc/server.py | 2 | ||||
| -rw-r--r-- | oslo_messaging/tests/test_exception_serialization.py | 20 | ||||
| -rw-r--r-- | releasenotes/source/conf.py | 2 | ||||
| -rw-r--r-- | tox.ini | 12 |
7 files changed, 36 insertions, 41 deletions
@@ -1,29 +1,29 @@ - job: - name: oslo.messaging-tox-py36-func-scenario01 - parent: openstack-tox-py36 + name: oslo.messaging-tox-py38-func-scenario01 + parent: openstack-tox-py38 vars: - tox_envlist: py36-func-scenario01 + tox_envlist: py38-func-scenario01 bindep_profile: rabbit - job: - name: oslo.messaging-tox-py36-func-scenario02 - parent: openstack-tox-py36 + name: oslo.messaging-tox-py38-func-scenario02 + parent: openstack-tox-py38 vars: - tox_envlist: py36-func-scenario02 + tox_envlist: py38-func-scenario02 bindep_profile: rabbit kafka amqp1 - job: - name: oslo.messaging-tox-py36-func-scenario03 - parent: openstack-tox-py36 + name: oslo.messaging-tox-py38-func-scenario03 + parent: openstack-tox-py38 vars: - tox_envlist: py36-func-scenario03 + tox_envlist: py38-func-scenario03 bindep_profile: rabbit amqp1 - job: - name: oslo.messaging-tox-py36-func-scenario04 - parent: openstack-tox-py36 + name: oslo.messaging-tox-py38-func-scenario04 + parent: openstack-tox-py38 vars: - tox_envlist: py36-func-scenario04 + tox_envlist: py38-func-scenario04 bindep_profile: kafka amqp1 # Begin v3 native jobs @@ -114,12 +114,12 @@ - release-notes-jobs-python3 check: jobs: - - oslo.messaging-tox-py36-func-scenario01 - - oslo.messaging-tox-py36-func-scenario02: + - oslo.messaging-tox-py38-func-scenario01 + - oslo.messaging-tox-py38-func-scenario02: voting: false - - oslo.messaging-tox-py36-func-scenario03: + - oslo.messaging-tox-py38-func-scenario03: voting: false - - oslo.messaging-tox-py36-func-scenario04: + - oslo.messaging-tox-py38-func-scenario04: voting: false - oslo.messaging-src-dsvm-full-rabbit - oslo.messaging-src-dsvm-full-amqp1-hybrid: @@ -133,5 +133,5 @@ gate: jobs: - - oslo.messaging-tox-py36-func-scenario01 + - oslo.messaging-tox-py38-func-scenario01 - oslo.messaging-src-dsvm-full-rabbit diff --git a/lower-constraints.txt b/lower-constraints.txt index 9e5d76b..7d47a54 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -66,7 +66,6 @@ requests==2.14.2 requestsexceptions==1.2.0 rfc3986==0.3.1 Routes==2.3.1 -six==1.10.0 smmap==0.9.0 snowballstemmer==1.2.1 statsd==3.2.1 diff --git a/oslo_messaging/_drivers/amqp1_driver/controller.py b/oslo_messaging/_drivers/amqp1_driver/controller.py index 6297507..5451cab 100644 --- a/oslo_messaging/_drivers/amqp1_driver/controller.py +++ b/oslo_messaging/_drivers/amqp1_driver/controller.py @@ -1022,9 +1022,9 @@ class Controller(pyngus.ConnectionEventHandler): def _do_connect(self): """Establish connection and reply subscription on processor thread.""" host = self.hosts.current - conn_props = {'properties': {u'process': self._command, - u'pid': self._pid, - u'node': self._node}} + conn_props = {'properties': {'process': self._command, + 'pid': self._pid, + 'node': self._node}} # only set hostname in the AMQP 1.0 Open performative if the message # bus can interpret it as the virtual host. We leave it unspecified # since apparently noone can agree on how it should be used otherwise! diff --git a/oslo_messaging/rpc/server.py b/oslo_messaging/rpc/server.py index 03517c3..78557e2 100644 --- a/oslo_messaging/rpc/server.py +++ b/oslo_messaging/rpc/server.py @@ -168,7 +168,7 @@ class RPCServer(msg_server.MessageHandlingServer): # by another exception raised by a log handler during # LOG.debug(). So keep a copy and delete it later. failure = e.exc_info - LOG.debug(u'Expected exception during message handling (%s)', e) + LOG.debug('Expected exception during message handling (%s)', e) except rpc_dispatcher.NoSuchMethod as e: failure = sys.exc_info() if e.method.endswith('_ignore_errors'): diff --git a/oslo_messaging/tests/test_exception_serialization.py b/oslo_messaging/tests/test_exception_serialization.py index 93b63c5..f4ca495 100644 --- a/oslo_messaging/tests/test_exception_serialization.py +++ b/oslo_messaging/tests/test_exception_serialization.py @@ -198,9 +198,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase): args=[], kwargs={}, str=("Remote error: NovaStyleException test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), msg=("Remote error: NovaStyleException test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), remote_name='RemoteError', remote_args=(), remote_kwargs={'exc_type': 'NovaStyleException', @@ -214,9 +214,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase): args=[], kwargs={}, str=("Remote error: Exception test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), msg=("Remote error: Exception test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), remote_name='RemoteError', remote_args=(), remote_kwargs={'exc_type': 'Exception', @@ -230,9 +230,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase): args=[], kwargs={}, str=("Remote error: FarcicalError test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), msg=("Remote error: FarcicalError test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), remote_name='RemoteError', remote_args=(), remote_kwargs={'exc_type': 'FarcicalError', @@ -246,9 +246,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase): args=[], kwargs={'foobar': 'blaa'}, str=("Remote error: Exception test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), msg=("Remote error: Exception test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), remote_name='RemoteError', remote_args=(), remote_kwargs={'exc_type': 'Exception', @@ -262,9 +262,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase): args=[], kwargs={}, str=("Remote error: SystemExit test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), msg=("Remote error: SystemExit test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), remote_name='RemoteError', remote_args=(), remote_kwargs={'exc_type': 'SystemExit', diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index f847170..6d444a3 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -27,7 +27,7 @@ # -- Project information -------------------------------------------------- # General information about the project. -copyright = u'2016, oslo.messaging Developers' +copyright = '2016, oslo.messaging Developers' # Release notes do not need a version in the title, they span # multiple versions. @@ -54,22 +54,19 @@ commands = # scenario03 amqp rabbit # scenario04 amqp kafka # -[testenv:py36-func-scenario01] -basepython = python3.6 +[testenv:py38-func-scenario01] setenv = {[testenv]setenv} SCENARIO=scenario01 commands = {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional} -[testenv:py36-func-scenario02] -basepython = python3.6 +[testenv:py38-func-scenario02] setenv = {[testenv]setenv} SCENARIO=scenario02 commands = {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional} -[testenv:py36-func-scenario03] -basepython = python3.6 +[testenv:py38-func-scenario03] setenv = {[testenv]setenv} SCENARIO=scenario03 @@ -77,8 +74,7 @@ setenv = WORKDIR={toxworkdir} commands = {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional} -[testenv:py36-func-scenario04] -basepython = python3.6 +[testenv:py38-func-scenario04] setenv = {[testenv]setenv} SCENARIO=scenario04 |