Hello community, here is the log from the commit of package python3-CherryPy for openSUSE:Factory checked in at 2016-07-27 16:12:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-CherryPy (Old) and /work/SRC/openSUSE:Factory/.python3-CherryPy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-CherryPy" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-CherryPy/python3-CherryPy.changes 2016-07-21 08:19:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-CherryPy.new/python3-CherryPy.changes 2016-07-27 16:13:09.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Jul 26 03:49:28 UTC 2016 - [email protected] + +- update to version 7.0.0: + * Removed the long-deprecated backward compatibility forlegacy + config keys in the engine. Use the config for + thenamespaced-plugins instead: + * autoreload_on -> autoreload.on + * autoreload_frequency -> autoreload.frequency + * autoreload_match -> autoreload.match + * reload_files -> autoreload.files + * deadlock_poll_frequency -> timeout_monitor.frequency + +- changes from version 6.2.1: + * # 1460: Fix KeyError in Bus.publish when signal handlers set in + config. + +------------------------------------------------------------------- Old: ---- CherryPy-6.2.0.tar.gz New: ---- CherryPy-7.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-CherryPy.spec ++++++ --- /var/tmp/diff_new_pack.lBEPGy/_old 2016-07-27 16:13:11.000000000 +0200 +++ /var/tmp/diff_new_pack.lBEPGy/_new 2016-07-27 16:13:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: python3-CherryPy -Version: 6.2.0 +Version: 7.0.0 Release: 0 Url: http://www.cherrypy.org Summary: Object-Oriented HTTP framework ++++++ CherryPy-6.2.0.tar.gz -> CherryPy-7.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CherryPy-6.2.0/CherryPy.egg-info/PKG-INFO new/CherryPy-7.0.0/CherryPy.egg-info/PKG-INFO --- old/CherryPy-6.2.0/CherryPy.egg-info/PKG-INFO 2016-07-19 03:06:17.000000000 +0200 +++ new/CherryPy-7.0.0/CherryPy.egg-info/PKG-INFO 2016-07-24 18:16:11.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: CherryPy -Version: 6.2.0 +Version: 7.0.0 Summary: Object-Oriented HTTP framework Home-page: http://www.cherrypy.org Author: CherryPy Team diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CherryPy-6.2.0/PKG-INFO new/CherryPy-7.0.0/PKG-INFO --- old/CherryPy-6.2.0/PKG-INFO 2016-07-19 03:06:17.000000000 +0200 +++ new/CherryPy-7.0.0/PKG-INFO 2016-07-24 18:16:11.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: CherryPy -Version: 6.2.0 +Version: 7.0.0 Summary: Object-Oriented HTTP framework Home-page: http://www.cherrypy.org Author: CherryPy Team diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CherryPy-6.2.0/cherrypy/_cpconfig.py new/CherryPy-7.0.0/cherrypy/_cpconfig.py --- old/CherryPy-6.2.0/cherrypy/_cpconfig.py 2016-07-19 03:04:51.000000000 +0200 +++ new/CherryPy-7.0.0/cherrypy/_cpconfig.py 2016-07-24 18:14:49.000000000 +0200 @@ -264,39 +264,13 @@ def _engine_namespace_handler(k, v): - """Backward compatibility handler for the "engine" namespace.""" + """Config handler for the "engine" namespace.""" engine = cherrypy.engine - deprecated = { - 'autoreload_on': 'autoreload.on', - 'autoreload_frequency': 'autoreload.frequency', - 'autoreload_match': 'autoreload.match', - 'reload_files': 'autoreload.files', - 'deadlock_poll_freq': 'timeout_monitor.frequency' - } - - if k in deprecated: - engine.log( - 'WARNING: Use of engine.%s is deprecated and will be removed in a ' - 'future version. Use engine.%s instead.' % (k, deprecated[k])) - - if k == 'autoreload_on': - if v: - engine.autoreload.subscribe() - else: - engine.autoreload.unsubscribe() - elif k == 'autoreload_frequency': - engine.autoreload.frequency = v - elif k == 'autoreload_match': - engine.autoreload.match = v - elif k == 'reload_files': - engine.autoreload.files = set(v) - elif k == 'deadlock_poll_freq': - engine.timeout_monitor.frequency = v - elif k == 'SIGHUP': - engine.listeners['SIGHUP'] = set([v]) + if k == 'SIGHUP': + engine.subscribe('SIGHUP', v) elif k == 'SIGTERM': - engine.listeners['SIGTERM'] = set([v]) + engine.subscribe('SIGTERM', v) elif "." in k: plugin, attrname = k.split(".", 1) plugin = getattr(engine, plugin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CherryPy-6.2.0/cherrypy/daemon.py new/CherryPy-7.0.0/cherrypy/daemon.py --- old/CherryPy-6.2.0/cherrypy/daemon.py 2016-07-19 03:04:51.000000000 +0200 +++ new/CherryPy-7.0.0/cherrypy/daemon.py 2016-07-24 18:14:49.000000000 +0200 @@ -48,7 +48,7 @@ sys.exit(1) elif fastcgi or scgi or cgi: # Turn off autoreload when using *cgi. - cherrypy.config.update({'engine.autoreload_on': False}) + cherrypy.config.update({'engine.autoreload.on': False}) # Turn off the default HTTP server (which is subscribed by default). cherrypy.server.unsubscribe() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CherryPy-6.2.0/cherrypy/process/wspbus.py new/CherryPy-7.0.0/cherrypy/process/wspbus.py --- old/CherryPy-6.2.0/cherrypy/process/wspbus.py 2016-07-19 03:04:51.000000000 +0200 +++ new/CherryPy-7.0.0/cherrypy/process/wspbus.py 2016-07-24 18:14:49.000000000 +0200 @@ -170,9 +170,8 @@ def subscribe(self, channel, callback, priority=None): """Add the given callback at the given channel (if not present).""" - if channel not in self.listeners: - self.listeners[channel] = set() - self.listeners[channel].add(callback) + ch_listeners = self.listeners.setdefault(channel, set()) + ch_listeners.add(callback) if priority is None: priority = getattr(callback, 'priority', 50) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CherryPy-6.2.0/cherrypy/test/benchmark.py new/CherryPy-7.0.0/cherrypy/test/benchmark.py --- old/CherryPy-6.2.0/cherrypy/test/benchmark.py 2016-07-19 03:04:51.000000000 +0200 +++ new/CherryPy-7.0.0/cherrypy/test/benchmark.py 2016-07-24 18:14:49.000000000 +0200 @@ -86,7 +86,7 @@ 'server.socket_port': 54583, 'server.max_request_header_size': 0, 'server.max_request_body_size': 0, - 'engine.deadlock_poll_freq': 0, + 'engine.timeout_monitor.frequency': 0, }) # Cheat mode on ;) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CherryPy-6.2.0/cherrypy/test/test_states.py new/CherryPy-7.0.0/cherrypy/test/test_states.py --- old/CherryPy-6.2.0/cherrypy/test/test_states.py 2016-07-19 03:04:51.000000000 +0200 +++ new/CherryPy-7.0.0/cherrypy/test/test_states.py 2016-07-24 18:14:49.000000000 +0200 @@ -82,7 +82,7 @@ cherrypy.tree.mount(Root()) cherrypy.config.update({ 'environment': 'test_suite', - 'engine.deadlock_poll_freq': 0.1, + 'engine.timeout_monitor.frequency': 0.1, }) db_connection.subscribe() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CherryPy-6.2.0/setup.cfg new/CherryPy-7.0.0/setup.cfg --- old/CherryPy-6.2.0/setup.cfg 2016-07-19 03:06:17.000000000 +0200 +++ new/CherryPy-7.0.0/setup.cfg 2016-07-24 18:16:11.000000000 +0200 @@ -1,5 +1,5 @@ [bumpversion] -current_version = 6.2.0 +current_version = 7.0.0 commit = True tag = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CherryPy-6.2.0/setup.py new/CherryPy-7.0.0/setup.py --- old/CherryPy-6.2.0/setup.py 2016-07-19 03:04:51.000000000 +0200 +++ new/CherryPy-7.0.0/setup.py 2016-07-24 18:14:49.000000000 +0200 @@ -2,6 +2,7 @@ import re from distutils.command.install import INSTALL_SCHEMES from distutils.command.build_py import build_py +from setuptools.command.test import test as TestCommand import setuptools @@ -21,11 +22,39 @@ return build_py.build_module(self, module, module_file, package) +class Tox(TestCommand): + """ + Command for running tox on `python setup.py test` invocation + + Shamelessly stolen from http://stackoverflow.com/a/11547391/595220 + """ + user_options = [('tox-args=', 'a', 'Arguments to pass to tox')] + + def initialize_options(self): + TestCommand.initialize_options(self) + self.tox_args = None + + def finalize_options(self): + TestCommand.finalize_options(self) + self.test_args = [] + self.test_suite = True + + def run_tests(self): + # import here, cause outside the eggs aren't loaded + import tox + import shlex + args = self.tox_args + if args: + args = shlex.split(self.tox_args) + errno = tox.cmdline(args=args) + sys.exit(errno) + + ############################################################################### # arguments for the setup command ############################################################################### name = "CherryPy" -version = "6.2.0" +version = "7.0.0" desc = "Object-Oriented HTTP framework" long_desc = "CherryPy is a pythonic, object-oriented HTTP framework" classifiers = [ @@ -100,9 +129,14 @@ 'six', ] -cmd_class = dict( - build_py=cherrypy_build_py, -) +tests_require = [ + 'tox', +] + +cmd_class = { + 'build_py': cherrypy_build_py, + 'test': Tox, # Enables `python setup.py test` invocation run tox tests +} if sys.version_info >= (3, 0): required_python_version = '3.1' @@ -135,8 +169,11 @@ scripts=scripts, cmdclass=cmd_class, install_requires=install_requires, + # Enables `python setup.py test` invocation install test dependencies first + tests_require=tests_require, ) + def main(): if sys.version < required_python_version: s = "I'm sorry, but %s %s requires Python %s or later."
