Hello community, here is the log from the commit of package python-fedmsg for openSUSE:Factory checked in at 2018-05-04 11:29:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-fedmsg (Old) and /work/SRC/openSUSE:Factory/.python-fedmsg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-fedmsg" Fri May 4 11:29:19 2018 rev:2 rq:603177 version:1.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-fedmsg/python-fedmsg.changes 2018-02-15 13:25:19.484371656 +0100 +++ /work/SRC/openSUSE:Factory/.python-fedmsg.new/python-fedmsg.changes 2018-05-04 11:29:46.567157807 +0200 @@ -1,0 +2,6 @@ +Wed Mar 21 20:38:20 UTC 2018 - [email protected] + +- update to version 1.1.1 + * Fix a bug in the configuration validation for crl_cache_expiry and ca_cert_cache_expiry (#500). + +------------------------------------------------------------------- Old: ---- fedmsg-1.1.0.tar.gz New: ---- fedmsg-1.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-fedmsg.spec ++++++ --- /var/tmp/diff_new_pack.nzCGOt/_old 2018-05-04 11:29:47.103138143 +0200 +++ /var/tmp/diff_new_pack.nzCGOt/_new 2018-05-04 11:29:47.103138143 +0200 @@ -13,38 +13,39 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-fedmsg -Version: 1.1.0 +Version: 1.1.1 Release: 0 -License: LGPL-2.1+ Summary: Fedora Messaging Client API -Url: https://fedmsg.readthedocs.io/en/stable +License: LGPL-2.1-or-later Group: Development/Languages/Python +Url: https://fedmsg.readthedocs.io/en/stable Source: https://files.pythonhosted.org/packages/source/f/fedmsg/fedmsg-%{version}.tar.gz -BuildRequires: python-rpm-macros BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes +BuildRequires: python-rpm-macros # SECTION tests +BuildRequires: %{python_module SQLAlchemy} +BuildRequires: %{python_module arrow} +BuildRequires: %{python_module click} +BuildRequires: %{python_module kitchen} BuildRequires: %{python_module mock} +BuildRequires: %{python_module moksha-hub} +BuildRequires: %{python_module psutil} +BuildRequires: %{python_module pygments} BuildRequires: %{python_module pyzmq} -BuildRequires: %{python_module kitchen} BuildRequires: %{python_module requests} BuildRequires: %{python_module six} -BuildRequires: %{python_module arrow} -BuildRequires: %{python_module SQLAlchemy} -BuildRequires: %{python_module moksha-hub} -BuildRequires: %{python_module pygments} -BuildRequires: %{python_module psutil} BuildRequires: %{python_module vcrpy} -BuildRequires: %{python_module click} BuildRequires: gpg2 # /SECTION -Requires: python-pyzmq Requires: python-kitchen +Requires: python-pyzmq Requires: python-requests Requires: python-six Recommends: python-arrow ++++++ fedmsg-1.1.0.tar.gz -> fedmsg-1.1.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fedmsg-1.1.0/PKG-INFO new/fedmsg-1.1.1/PKG-INFO --- old/fedmsg-1.1.0/PKG-INFO 2018-01-02 15:19:26.000000000 +0100 +++ new/fedmsg-1.1.1/PKG-INFO 2018-03-20 18:08:20.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: fedmsg -Version: 1.1.0 +Version: 1.1.1 Summary: Fedora Messaging Client API Home-page: https://github.com/fedora-infra/fedmsg/ Author: Ralph Bean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fedmsg-1.1.0/doc/changelog.rst new/fedmsg-1.1.1/doc/changelog.rst --- old/fedmsg-1.1.0/doc/changelog.rst 2018-01-02 15:16:49.000000000 +0100 +++ new/fedmsg-1.1.1/doc/changelog.rst 2018-03-20 18:00:57.000000000 +0100 @@ -2,6 +2,35 @@ Changelog ========= +v1.1.1 +====== + +Bug fixes +--------- + +* Fix a bug in the configuration validation for ``crl_cache_expiry`` and + ``ca_cert_cache_expiry`` (`#500 <https://github.com/fedora-infra/fedmsg/pull/500>`_). + +Developer improvements +---------------------- + +* Fix tests using the ``ca_cert_cache`` configuration as it is deprecated + (`#498 <https://github.com/fedora-infra/fedmsg/pull/498>`_). + +* Adjust the internal ``_consume`` API for fedmsg consumers to return the + Return any return value from the parent class's ``_consume`` + (`#507 <https://github.com/fedora-infra/fedmsg/pull/507>`_). + +Contributors +------------ + +Thanks to all the contributors for this release: + +* Sijis Aviles +* Ralph Bean +* Jeremy Cline + + v1.1.0 ====== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fedmsg-1.1.0/doc/conf.py new/fedmsg-1.1.1/doc/conf.py --- old/fedmsg-1.1.0/doc/conf.py 2018-01-02 15:16:49.000000000 +0100 +++ new/fedmsg-1.1.1/doc/conf.py 2018-03-20 18:02:57.000000000 +0100 @@ -66,7 +66,7 @@ # The short X.Y version. version = u'1.1' # The full version, including alpha/beta/rc tags. -release = u'1.1.0' +release = u'1.1.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fedmsg-1.1.0/doc/configuration.rst new/fedmsg-1.1.1/doc/configuration.rst --- old/fedmsg-1.1.0/doc/configuration.rst 2018-01-02 15:13:54.000000000 +0100 +++ new/fedmsg-1.1.1/doc/configuration.rst 2018-02-14 15:57:23.000000000 +0100 @@ -156,9 +156,8 @@ relay_inbound ------------- -``str`` - A list of special zeromq endpoints where the inbound, -passive zmq SUB sockets for for instances of ``fedmsg-relay`` are -listening. +``str`` - A special zeromq endpoint where the inbound, passive zmq SUB +sockets for instances of ``fedmsg-relay`` are listening. Commands like ``fedmsg-logger`` actively connect here and publish their messages. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fedmsg-1.1.0/doc/deployment.rst new/fedmsg-1.1.1/doc/deployment.rst --- old/fedmsg-1.1.0/doc/deployment.rst 2017-12-14 01:11:45.000000000 +0100 +++ new/fedmsg-1.1.1/doc/deployment.rst 2018-01-24 09:58:41.000000000 +0100 @@ -116,9 +116,7 @@ "tcp://hostA:4001", ], }, - relay_inbound=[ - "tcp://hostA:2003", - ], + relay_inbound = "tcp://hostA:2003", ) To confirm that something's not immediately broken, you can go through the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fedmsg-1.1.0/fedmsg/config.py new/fedmsg-1.1.1/fedmsg/config.py --- old/fedmsg-1.1.0/fedmsg/config.py 2018-01-02 15:13:54.000000000 +0100 +++ new/fedmsg-1.1.1/fedmsg/config.py 2018-03-20 17:48:53.000000000 +0100 @@ -294,8 +294,8 @@ 'validator': _validate_none_or_type(six.text_type), }, 'crl_cache_expiry': { - 'default': None, - 'validator': _validate_none_or_type(six.text_type), + 'default': 3600, + 'validator': _validate_non_negative_int, }, 'ca_cert_location': { 'default': u'/etc/pki/fedmsg/ca.crt', @@ -306,8 +306,8 @@ 'validator': _validate_none_or_type(six.text_type), }, 'ca_cert_cache_expiry': { - 'default': None, - 'validator': _validate_none_or_type(six.text_type), + 'default': 0, + 'validator': _validate_non_negative_int, }, 'certnames': { 'default': {}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fedmsg-1.1.0/fedmsg/consumers/__init__.py new/fedmsg-1.1.1/fedmsg/consumers/__init__.py --- old/fedmsg-1.1.0/fedmsg/consumers/__init__.py 2017-12-14 01:11:45.000000000 +0100 +++ new/fedmsg-1.1.1/fedmsg/consumers/__init__.py 2018-03-20 17:49:00.000000000 +0100 @@ -271,6 +271,32 @@ raise RuntimeWarning("Failed to authn message.") def _consume(self, message): + """ Called when a message is consumed. + + This private method handles some administrative setup and teardown + before calling the public interface `consume` typically implemented + by a subclass. + + When `moksha.blocking_mode` is set to `False` in the config, this + method always returns `None`. The argued message is stored in an + internal queue where the consumer's worker threads should eventually + pick it up. + + When `moksha.blocking_mode` is set to `True` in the config, this + method should return True or False, indicating whether the message + was handled or not. Specifically, in the event that the inner + `consume` method raises an exception of any kind, this method + should return `False` indicating that the message was not + successfully handled. + + Args: + message (dict): The message as a dictionary. + + Returns: + bool: Should be interpreted as whether or not the message was + handled by the consumer, or `None` if `moksha.blocking_mode` is + set to False. + """ try: self.validate(message) @@ -290,11 +316,11 @@ try: self.validate(m) - super(FedmsgConsumer, self)._consume(m) + return super(FedmsgConsumer, self)._consume(m) except RuntimeWarning as e: self.log.warn("Received invalid message {}".format(e)) else: - super(FedmsgConsumer, self)._consume(message) + return super(FedmsgConsumer, self)._consume(message) def pre_consume(self, message): self.save_status(dict( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fedmsg-1.1.0/fedmsg/tests/fedmsg-test-config.py new/fedmsg-1.1.1/fedmsg/tests/fedmsg-test-config.py --- old/fedmsg-1.1.0/fedmsg/tests/fedmsg-test-config.py 2017-12-14 01:11:45.000000000 +0100 +++ new/fedmsg-1.1.1/fedmsg/tests/fedmsg-test-config.py 2018-01-24 09:58:41.000000000 +0100 @@ -65,7 +65,7 @@ # Guarantee that we don't fall over with a bogus endpoint. "blah.%s": "tcp://www.flugle.horn:88", }, - relay_inbound=["tcp://127.0.0.1:%i" % (port - 1)], + relay_inbound="tcp://127.0.0.1:%i" % (port - 1), replay_endpoints={ 'unittest.%s' % hostname: "tcp://127.0.0.1:%i" % (port + 1), 'unittest2.%s' % hostname: "tcp://127.0.0.1:%i" % (port + 2), @@ -88,7 +88,7 @@ crl_location="http://threebean.org/fedmsg-tests/crl.pem";, crl_cache="/tmp/crl.pem", - crl_cache_expiry=10, + crl_cache_expiry=3600, certnames={ "unittest.%s" % hostname: "shell-app01.phx2.fedoraproject.org", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fedmsg-1.1.0/fedmsg/tests/test_config.py new/fedmsg-1.1.1/fedmsg/tests/test_config.py --- old/fedmsg-1.1.0/fedmsg/tests/test_config.py 2017-12-14 01:11:45.000000000 +0100 +++ new/fedmsg-1.1.1/fedmsg/tests/test_config.py 2018-02-14 15:57:23.000000000 +0100 @@ -159,10 +159,10 @@ 'ssldir': '/etc/pki/fedmsg', 'crl_location': None, 'crl_cache': None, - 'crl_cache_expiry': None, + 'crl_cache_expiry': 3600, 'ca_cert_location': '/etc/pki/fedmsg/ca.crt', 'ca_cert_cache': None, - 'ca_cert_cache_expiry': None, + 'ca_cert_cache_expiry': 0, 'certnames': {}, 'routing_policy': {}, 'routing_nitpicky': False, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fedmsg-1.1.0/fedmsg/tests/test_crypto_switching.py new/fedmsg-1.1.1/fedmsg/tests/test_crypto_switching.py --- old/fedmsg-1.1.0/fedmsg/tests/test_crypto_switching.py 2017-12-14 01:11:45.000000000 +0100 +++ new/fedmsg-1.1.1/fedmsg/tests/test_crypto_switching.py 2018-01-24 09:58:41.000000000 +0100 @@ -44,7 +44,7 @@ 'certname': 'shell-app01.phx2.fedoraproject.org', 'crl_location': "http://threebean.org/fedmsg-tests/crl.pem";, 'crl_cache': "/tmp/crl.pem", - 'crl_cache_expiry': 10, + 'crl_cache_expiry': 3600, # But *not* x509 'crypto_validate_backends': ['gpg'], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fedmsg-1.1.0/fedmsg.d/relay.py new/fedmsg-1.1.1/fedmsg.d/relay.py --- old/fedmsg-1.1.0/fedmsg.d/relay.py 2017-12-14 01:11:45.000000000 +0100 +++ new/fedmsg-1.1.1/fedmsg.d/relay.py 2018-01-24 09:58:41.000000000 +0100 @@ -33,7 +33,5 @@ # It is also used by the git-hook, for the same reason. # It is also used by the mediawiki php plugin which, due to the oddities of # php, can't maintain a single passive-bind endpoint of it's own. - relay_inbound=[ - "tcp://127.0.0.1:2003", - ], + relay_inbound="tcp://127.0.0.1:2003", ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fedmsg-1.1.0/fedmsg.d/ssl.py new/fedmsg-1.1.1/fedmsg.d/ssl.py --- old/fedmsg-1.1.0/fedmsg.d/ssl.py 2017-12-14 01:11:45.000000000 +0100 +++ new/fedmsg-1.1.1/fedmsg.d/ssl.py 2018-01-24 09:58:41.000000000 +0100 @@ -33,7 +33,7 @@ ssldir="/etc/pki/fedmsg", crl_location="https://fedoraproject.org/fedmsg/crl.pem";, crl_cache="/var/run/fedmsg/crl.pem", - crl_cache_expiry=10, + crl_cache_expiry=3600, ca_cert_location="https://fedoraproject.org/fedmsg/ca.crt";, ca_cert_cache="/var/run/fedmsg/ca.crt", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fedmsg-1.1.0/fedmsg.egg-info/PKG-INFO new/fedmsg-1.1.1/fedmsg.egg-info/PKG-INFO --- old/fedmsg-1.1.0/fedmsg.egg-info/PKG-INFO 2018-01-02 15:19:26.000000000 +0100 +++ new/fedmsg-1.1.1/fedmsg.egg-info/PKG-INFO 2018-03-20 18:08:20.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: fedmsg -Version: 1.1.0 +Version: 1.1.1 Summary: Fedora Messaging Client API Home-page: https://github.com/fedora-infra/fedmsg/ Author: Ralph Bean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fedmsg-1.1.0/fedmsg.egg-info/requires.txt new/fedmsg-1.1.1/fedmsg.egg-info/requires.txt --- old/fedmsg-1.1.0/fedmsg.egg-info/requires.txt 2018-01-02 15:19:26.000000000 +0100 +++ new/fedmsg-1.1.1/fedmsg.egg-info/requires.txt 2018-03-20 18:08:20.000000000 +0100 @@ -5,14 +5,14 @@ arrow [all] +click +moksha.hub>=1.3.0 +M2Crypto +m2ext psutil +pyOpenSSL>=16.1.0 pygments -M2Crypto cryptography>=1.6 -pyOpenSSL>=16.1.0 -m2ext -click -moksha.hub>=1.3.0 [commands] pygments diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fedmsg-1.1.0/setup.py new/fedmsg-1.1.1/setup.py --- old/fedmsg-1.1.0/setup.py 2018-01-02 15:16:49.000000000 +0100 +++ new/fedmsg-1.1.1/setup.py 2018-03-20 18:02:42.000000000 +0100 @@ -104,7 +104,7 @@ setup( name='fedmsg', - version='1.1.0', + version='1.1.1', description="Fedora Messaging Client API", long_description=long_description, author='Ralph Bean',
