Hello community,
here is the log from the commit of package python-oslo.messaging for
openSUSE:Factory checked in at 2020-08-10 15:05:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-oslo.messaging (Old)
and /work/SRC/openSUSE:Factory/.python-oslo.messaging.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.messaging"
Mon Aug 10 15:05:31 2020 rev:22 rq:825319 version:12.1.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-oslo.messaging/python-oslo.messaging.changes
2020-07-29 17:21:03.996589649 +0200
+++
/work/SRC/openSUSE:Factory/.python-oslo.messaging.new.3399/python-oslo.messaging.changes
2020-08-10 15:06:03.492255812 +0200
@@ -1,0 +2,11 @@
+Wed Aug 5 12:36:58 UTC 2020 - [email protected]
+
+- Proper fix for forever looping test (bsc#1163136) is the kombu change below
+- update to version 12.1.2
+ - tests: Resolves issues with kombu > 4.6.8
+ - Update .gitreview for stable/ussuri
+ - Update TOX/UPPER_CONSTRAINTS_FILE for stable/ussuri
+ - Simplify tools/test-setup.sh
+ - Print warning message when connection running out
+
+-------------------------------------------------------------------
Old:
----
oslo.messaging-12.1.0.tar.gz
New:
----
oslo.messaging-12.1.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-oslo.messaging.spec ++++++
--- /var/tmp/diff_new_pack.NjiCUd/_old 2020-08-10 15:06:04.632256414 +0200
+++ /var/tmp/diff_new_pack.NjiCUd/_new 2020-08-10 15:06:04.636256416 +0200
@@ -17,13 +17,13 @@
Name: python-oslo.messaging
-Version: 12.1.0
+Version: 12.1.2
Release: 0
Summary: OpenStack oslo.messaging library
License: Apache-2.0
Group: Development/Languages/Python
URL: https://launchpad.net/oslo.messaging
-Source0:
https://files.pythonhosted.org/packages/source/o/oslo.messaging/oslo.messaging-12.1.0.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/o/oslo.messaging/oslo.messaging-12.1.2.tar.gz
BuildRequires: openstack-macros
BuildRequires: python3-PyYAML >= 3.12
BuildRequires: python3-WebOb >= 1.7.1
@@ -101,16 +101,9 @@
This package contains the documentation.
%prep
-%autosetup -p1 -n oslo.messaging-12.1.0
+%autosetup -p1 -n oslo.messaging-12.1.2
%py_req_cleanup
-%if !0%{?suse_version}
-# FIXME(jpena): since version 5.23.0, four tests in the amqp driver are
-# failing. Let's remove the tests for now, so we can build a package and
-# figure out whatis wrong.
-rm -f oslo_messaging/tests/drivers/test_amqp_driver.py
-%endif
-
%build
%py3_build
@@ -124,11 +117,11 @@
%check
# NOTE(jpena): we do not want to run functional tests, just unit tests
+# python3-pifpaf is not available in RDO, but loading functional tests would
+# fail without it
rm -rf oslo_messaging/tests/functional
-# workaround test running forever until update to release with fix
-# https://review.opendev.org/#/c/742609/
-rm -f oslo_messaging/tests/drivers/test_impl_rabbit.py
-python3 -m stestr.cli run
+# 3 cyrus tests fail on rdo with time out
+python3 -m stestr.cli run --black-regex
'^oslo_messaging.tests.(functional|drivers.test_amqp_driver.TestCyrusAuthentication.test_authentication_(ok|ignore_default_realm|default_realm))'
%files -n python3-oslo.messaging
%license LICENSE
++++++ oslo.messaging-12.1.0.tar.gz -> oslo.messaging-12.1.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.messaging-12.1.0/.zuul.yaml
new/oslo.messaging-12.1.2/.zuul.yaml
--- old/oslo.messaging-12.1.0/.zuul.yaml 2020-04-07 12:11:11.000000000
+0200
+++ new/oslo.messaging-12.1.2/.zuul.yaml 2020-08-03 16:09:27.000000000
+0200
@@ -10,21 +10,21 @@
parent: openstack-tox-py36
vars:
tox_envlist: py36-func-scenario02
- bindep_profile: rabbit kafka
+ bindep_profile: rabbit kafka amqp1
- job:
name: oslo.messaging-tox-py36-func-scenario03
parent: openstack-tox-py36
vars:
tox_envlist: py36-func-scenario03
- bindep_profile: rabbit
+ bindep_profile: rabbit amqp1
- job:
name: oslo.messaging-tox-py36-func-scenario04
parent: openstack-tox-py36
vars:
tox_envlist: py36-func-scenario04
- bindep_profile: kafka
+ bindep_profile: kafka amqp1
# Begin v3 native jobs
# See https://docs.openstack.org/devstack/latest/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.messaging-12.1.0/AUTHORS
new/oslo.messaging-12.1.2/AUTHORS
--- old/oslo.messaging-12.1.0/AUTHORS 2020-04-07 12:12:21.000000000 +0200
+++ new/oslo.messaging-12.1.2/AUTHORS 2020-08-03 16:12:26.000000000 +0200
@@ -226,6 +226,7 @@
pengyuesheng <[email protected]>
ricolin <[email protected]>
root <[email protected]>
+shenjiatong <[email protected]>
sonu.kumar <[email protected]>
tengqm <[email protected]>
ting.wang <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.messaging-12.1.0/ChangeLog
new/oslo.messaging-12.1.2/ChangeLog
--- old/oslo.messaging-12.1.0/ChangeLog 2020-04-07 12:12:21.000000000 +0200
+++ new/oslo.messaging-12.1.2/ChangeLog 2020-08-03 16:12:26.000000000 +0200
@@ -1,6 +1,19 @@
CHANGES
=======
+12.1.2
+------
+
+* tests: Resolves issues with kombu > 4.6.8
+* Simplify tools/test-setup.sh
+
+12.1.1
+------
+
+* Print warning message when connection running out
+* Update TOX/UPPER\_CONSTRAINTS\_FILE for stable/ussuri
+* Update .gitreview for stable/ussuri
+
12.1.0
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.messaging-12.1.0/PKG-INFO
new/oslo.messaging-12.1.2/PKG-INFO
--- old/oslo.messaging-12.1.0/PKG-INFO 2020-04-07 12:12:22.000000000 +0200
+++ new/oslo.messaging-12.1.2/PKG-INFO 2020-08-03 16:12:26.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: oslo.messaging
-Version: 12.1.0
+Version: 12.1.2
Summary: Oslo Messaging API
Home-page: https://docs.openstack.org/oslo.messaging/latest/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.messaging-12.1.0/bindep.txt
new/oslo.messaging-12.1.2/bindep.txt
--- old/oslo.messaging-12.1.0/bindep.txt 2020-04-07 12:11:11.000000000
+0200
+++ new/oslo.messaging-12.1.2/bindep.txt 2020-08-03 16:09:27.000000000
+0200
@@ -15,21 +15,22 @@
rabbitmq-server [platform:rpm rabbit]
# AMQP1 dpkg
-qdrouterd [platform:dpkg amqp1]
-sasl2-bin [platform:dpkg amqp1]
-uuid-dev [platform:dpkg amqp1]
-swig [platform:dpkg amqp1]
-libsasl2-modules [platform:dpkg amqp1]
-openjdk-8-jdk [platform:dpkg amqp1]
+# This needs qpid/testing, will be installed by tools/test-setup.sh
+# qdrouterd [platform:dpkg amqp1 test]
+sasl2-bin [platform:dpkg amqp1 test]
+uuid-dev [platform:dpkg amqp1 test]
+swig [platform:dpkg amqp1 test]
+libsasl2-modules [platform:dpkg amqp1 test]
+openjdk-8-jdk [platform:dpkg amqp1 test]
-# AMQP1 rpm
-qpid-dispatch-router [platform:rpm amqp1]
-python-qpid-proton [platform:rpm amqp1]
-cyrus-sasl-lib [platform:rpm amqp1]
-cyrus-sasl-plain [platform:rpm amqp1]
-libuuid-devel [platform:rpm amqp1]
-swig [platform:rpm amqp1]
-java-1.8.0-openjdk [platform:rpm amqp1]
+# AMQP1 TEST rpm
+qpid-dispatch-router [platform:rpm amqp1 test]
+python-qpid-proton [platform:rpm amqp1 test]
+cyrus-sasl-lib [platform:rpm amqp1 test]
+cyrus-sasl-plain [platform:rpm amqp1 test]
+libuuid-devel [platform:rpm amqp1 test]
+swig [platform:rpm amqp1 test]
+java-1.8.0-openjdk [platform:rpm amqp1 test]
# kafka dpkg
openjdk-8-jdk [platform:dpkg kafka]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.messaging-12.1.0/oslo.messaging.egg-info/PKG-INFO
new/oslo.messaging-12.1.2/oslo.messaging.egg-info/PKG-INFO
--- old/oslo.messaging-12.1.0/oslo.messaging.egg-info/PKG-INFO 2020-04-07
12:12:21.000000000 +0200
+++ new/oslo.messaging-12.1.2/oslo.messaging.egg-info/PKG-INFO 2020-08-03
16:12:26.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: oslo.messaging
-Version: 12.1.0
+Version: 12.1.2
Summary: Oslo Messaging API
Home-page: https://docs.openstack.org/oslo.messaging/latest/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.messaging-12.1.0/oslo.messaging.egg-info/pbr.json
new/oslo.messaging-12.1.2/oslo.messaging.egg-info/pbr.json
--- old/oslo.messaging-12.1.0/oslo.messaging.egg-info/pbr.json 2020-04-07
12:12:21.000000000 +0200
+++ new/oslo.messaging-12.1.2/oslo.messaging.egg-info/pbr.json 2020-08-03
16:12:26.000000000 +0200
@@ -1 +1 @@
-{"git_version": "7f638bb4", "is_release": true}
\ No newline at end of file
+{"git_version": "6727be78", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.messaging-12.1.0/oslo.messaging.egg-info/requires.txt
new/oslo.messaging-12.1.2/oslo.messaging.egg-info/requires.txt
--- old/oslo.messaging-12.1.0/oslo.messaging.egg-info/requires.txt
2020-04-07 12:12:21.000000000 +0200
+++ new/oslo.messaging-12.1.2/oslo.messaging.egg-info/requires.txt
2020-08-03 16:12:26.000000000 +0200
@@ -1,19 +1,19 @@
-pbr!=2.1.0,>=2.0.0
+PyYAML>=3.12
+WebOb>=1.7.1
+amqp>=2.5.2
+cachetools>=2.0.0
+debtcollector>=1.2.0
futurist>=1.2.0
+kombu>=4.6.6
oslo.config>=5.2.0
oslo.log>=3.36.0
-oslo.utils>=3.37.0
+oslo.middleware>=3.31.0
oslo.serialization!=2.19.1,>=2.18.0
oslo.service!=1.28.1,>=1.24.0
-stevedore>=1.20.0
-debtcollector>=1.2.0
+oslo.utils>=3.37.0
+pbr!=2.1.0,>=2.0.0
six>=1.10.0
-cachetools>=2.0.0
-WebOb>=1.7.1
-PyYAML>=3.12
-amqp>=2.5.2
-kombu>=4.6.6
-oslo.middleware>=3.31.0
+stevedore>=1.20.0
[:(python_version<'3.3')]
monotonic>=0.6
@@ -25,17 +25,17 @@
confluent-kafka>=0.11.6
[test]
-hacking<3.1.0,>=3.0
+bandit<1.6.0,>=1.1.0
+confluent-kafka>=0.11.6
+coverage!=4.4,>=4.0
+eventlet!=0.18.3,!=0.20.1,>=0.18.2
fixtures>=3.0.0
+greenlet>=0.4.10
+hacking<3.1.0,>=3.0
mock>=2.0.0
-stestr>=2.0.0
-testscenarios>=0.4
-testtools>=2.2.0
oslotest>=3.2.0
pifpaf>=2.2.0
-confluent-kafka>=0.11.6
-coverage!=4.4,>=4.0
pyngus>=2.2.0
-bandit<1.6.0,>=1.1.0
-eventlet!=0.18.3,!=0.20.1,>=0.18.2
-greenlet>=0.4.10
+stestr>=2.0.0
+testscenarios>=0.4
+testtools>=2.2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.messaging-12.1.0/oslo_messaging/_drivers/pool.py
new/oslo.messaging-12.1.2/oslo_messaging/_drivers/pool.py
--- old/oslo.messaging-12.1.0/oslo_messaging/_drivers/pool.py 2020-04-07
12:11:11.000000000 +0200
+++ new/oslo.messaging-12.1.2/oslo_messaging/_drivers/pool.py 2020-08-03
16:09:27.000000000 +0200
@@ -100,6 +100,10 @@
self._current_size += 1
break
+ LOG.warning("Connection pool limit exceeded: "
+ "current size %s surpasses max "
+ "configured rpc_conn_pool_size %s",
+ self._current_size, self._max_size)
wait_condition(self._cond)
# We've grabbed a slot and dropped the lock, now do the creation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.messaging-12.1.0/oslo_messaging/tests/drivers/test_impl_rabbit.py
new/oslo.messaging-12.1.2/oslo_messaging/tests/drivers/test_impl_rabbit.py
--- old/oslo.messaging-12.1.0/oslo_messaging/tests/drivers/test_impl_rabbit.py
2020-04-07 12:11:11.000000000 +0200
+++ new/oslo.messaging-12.1.2/oslo_messaging/tests/drivers/test_impl_rabbit.py
2020-08-03 16:09:27.000000000 +0200
@@ -21,6 +21,7 @@
import fixtures
import kombu
+import kombu.connection
import kombu.transport.memory
from oslo_serialization import jsonutils
from oslo_utils import eventletutils
@@ -972,13 +973,19 @@
'kombu.connection.Connection.connection'))
self.useFixture(fixtures.MockPatch(
'kombu.connection.Connection.channel'))
+ # TODO(stephenfin): Drop hasattr when we drop support for kombo < 4.6.8
+ if hasattr(kombu.connection.Connection, '_connection_factory'):
+ self.useFixture(fixtures.MockPatch(
+ 'kombu.connection.Connection._connection_factory'))
# starting from the first broker in the list
url = oslo_messaging.TransportURL.parse(self.conf, None)
self.connection = rabbit_driver.Connection(self.conf, url,
driver_common.PURPOSE_SEND)
- self.useFixture(fixtures.MockPatch(
- 'kombu.connection.Connection.connect'))
+ # TODO(stephenfin): Remove when we drop support for kombo < 4.6.8
+ if hasattr(kombu.connection.Connection, 'connect'):
+ self.useFixture(fixtures.MockPatch(
+ 'kombu.connection.Connection.connect'))
self.addCleanup(self.connection.close)
def test_ensure_four_retry(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.messaging-12.1.0/tools/test-setup.sh
new/oslo.messaging-12.1.2/tools/test-setup.sh
--- old/oslo.messaging-12.1.0/tools/test-setup.sh 2020-04-07
12:11:11.000000000 +0200
+++ new/oslo.messaging-12.1.2/tools/test-setup.sh 2020-08-03
16:09:27.000000000 +0200
@@ -6,21 +6,9 @@
# This setup for amqp1 needs to be run by a user that can run sudo.
-function is_fedora {
- [ -f /usr/bin/yum ] && cat /etc/*release | grep -q -e "Fedora"
-}
-
-# NOTE(sileht): we create the virtualenv only and use bindep directly
-# because tox doesn't have a quiet option...
-tox -ebindep --notest
-
-# TODO(ansmith) for now setup amqp1 dependencies for any profile.
-# Fix this when test-setup is passed environment profile setting.
-
-# NOTE(sileht): bindep return 1 if some packages have to be installed
-PACKAGES="$(.tox/bindep/bin/bindep -b -f bindep.txt amqp1 || true)"
-
-[ -n "$PACKAGES" ] || exit 0
+# qdrouterd needs to be installed from qpid/testing repo in Ubuntu.
+# bindep does not allow setting up another repo, so we just install
+# this package here.
# inspired from project-config install-distro-packages.sh
if apt-get -v >/dev/null 2>&1 ; then
@@ -28,11 +16,5 @@
sudo apt-get -qq update
sudo PATH=/usr/sbin:/sbin:$PATH DEBIAN_FRONTEND=noninteractive \
apt-get -q --option "Dpkg::Options::=--force-confold" \
- --assume-yes install $PACKAGES
-elif emerge --version >/dev/null 2>&1 ; then
- sudo emerge -uDNq --jobs=4 @world
- sudo PATH=/usr/sbin:/sbin:$PATH emerge -q --jobs=4 $PACKAGES
-else
- is_fedora && YUM=dnf || YUM=yum
- sudo PATH=/usr/sbin:/sbin:$PATH $YUM install -y $PACKAGES
+ --assume-yes install qdrouterd
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.messaging-12.1.0/tox.ini
new/oslo.messaging-12.1.2/tox.ini
--- old/oslo.messaging-12.1.0/tox.ini 2020-04-07 12:11:11.000000000 +0200
+++ new/oslo.messaging-12.1.2/tox.ini 2020-08-03 16:09:27.000000000 +0200
@@ -12,7 +12,7 @@
REQUIREMENTS_PIP_LOCATION
install_command = pip install {opts} {packages}
deps =
-
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
commands = stestr run --slowest {posargs}
