Hello community,
here is the log from the commit of package python-sphinxcontrib-pecanwsme for openSUSE:13.1 checked in at 2013-10-23 11:27:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/python-sphinxcontrib-pecanwsme (Old)
and /work/SRC/openSUSE:13.1/.python-sphinxcontrib-pecanwsme.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-sphinxcontrib-pecanwsme"
Changes:
--------
--- /work/SRC/openSUSE:13.1/python-sphinxcontrib-pecanwsme/python-sphinxcontrib-pecanwsme.changes 2013-09-23 11:06:59.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.python-sphinxcontrib-pecanwsme.new/python-sphinxcontrib-pecanwsme.changes 2013-10-23 11:27:03.000000000 +0200
@@ -1,0 +2,19 @@
+Mon Oct 21 08:15:58 UTC 2013 - dmueller@suse.com
+
+- update to 0.5:
+ * Add rest verb as prefix for custom_actions
+
+-------------------------------------------------------------------
+Thu Sep 26 13:32:56 UTC 2013 - dmueller@suse.com
+
+- update to 0.4:
+ * Remove duplication in RESTControllerDirective
+ * Handle more pecan REST method
+
+-------------------------------------------------------------------
+Mon Sep 16 12:49:02 UTC 2013 - speilicke@suse.com
+
+- Update to version 0.3:
+ + Update pbr usage past the world of d2to1
+
+-------------------------------------------------------------------
Old:
----
sphinxcontrib-pecanwsme-0.2.tar.gz
New:
----
sphinxcontrib-pecanwsme-0.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-sphinxcontrib-pecanwsme.spec ++++++
--- /var/tmp/diff_new_pack.rHdDUC/_old 2013-10-23 11:27:03.000000000 +0200
+++ /var/tmp/diff_new_pack.rHdDUC/_new 2013-10-23 11:27:03.000000000 +0200
@@ -17,7 +17,7 @@
Name: python-sphinxcontrib-pecanwsme
-Version: 0.2
+Version: 0.5
Release: 0
Summary: Extension to Sphinx for documenting APIs built with Pecan and WSME
License: Apache-2.0
++++++ sphinxcontrib-pecanwsme-0.2.tar.gz -> sphinxcontrib-pecanwsme-0.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-pecanwsme-0.2/.gitignore new/sphinxcontrib-pecanwsme-0.5/.gitignore
--- old/sphinxcontrib-pecanwsme-0.2/.gitignore 2013-05-14 22:24:08.000000000 +0200
+++ new/sphinxcontrib-pecanwsme-0.5/.gitignore 1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-*.py[cod]
-
-# C extensions
-*.so
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-lib
-lib64
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-nosetests.xml
-
-# Translations
-*.mo
-
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-
-# Created during packaging
-AUTHORS
-ChangeLog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-pecanwsme-0.2/AUTHORS new/sphinxcontrib-pecanwsme-0.5/AUTHORS
--- old/sphinxcontrib-pecanwsme-0.2/AUTHORS 1970-01-01 01:00:00.000000000 +0100
+++ new/sphinxcontrib-pecanwsme-0.5/AUTHORS 2013-10-02 14:41:58.000000000 +0200
@@ -0,0 +1,4 @@
+Doug Hellmann
+Doug Hellmann
+Mehdi Abaakouk
+Monty Taylor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-pecanwsme-0.2/ChangeLog new/sphinxcontrib-pecanwsme-0.5/ChangeLog
--- old/sphinxcontrib-pecanwsme-0.2/ChangeLog 1970-01-01 01:00:00.000000000 +0100
+++ new/sphinxcontrib-pecanwsme-0.5/ChangeLog 2013-10-02 14:41:58.000000000 +0200
@@ -0,0 +1,98 @@
+commit d739f25cf684e8d60c81853500bfd69f6bfe39e1
+Author: Doug Hellmann
+Date: Wed Oct 2 08:40:22 2013 -0400
+
+ add announcement file before tagging release
+
+commit 3530f37352c26869352e1baf0545c58831eab7ff
+Merge: 4dba9ab 0f9e154
+Author: Doug Hellmann
+Date: Mon Sep 23 13:35:47 2013 -0700
+
+ Merge pull request #5 from enovance/sileht/multiple_method_for_one_verb
+
+ Add rest verb as prefix for custom_actions
+
+commit 0f9e15461882262c4c61a4717b74cdb970cb03a5
+Author: Mehdi Abaakouk
+Date: Thu Sep 19 16:27:47 2013 +0200
+
+ Add rest verb as prefix for custom_actions
+
+ When a custom action use multiple verb, each verb look for a method
+ named VERB_ACTION if it exists otherise it use only the method named
+ ACTION.
+
+commit 4dba9abaed488549026b1fba494898ce8ec48198
+Author: Doug Hellmann
+Date: Tue Sep 17 11:00:46 2013 -0500
+
+ Remove duplication in RESTControllerDirective
+
+ Build a list of generators, then chain them together in
+ the return value of run().
+
+commit 44300016087fdfe30741651d111dcb3df97d988b
+Merge: a382d6f 9dfbe25
+Author: Doug Hellmann
+Date: Tue Sep 17 08:48:24 2013 -0700
+
+ Merge pull request #4 from enovance/sileht/add_missing_rest_verbs
+
+ Handle more pecan REST method
+
+commit 9dfbe251b311d5f9f159d378f45aa28757e65e83
+Author: Mehdi Abaakouk
+Date: Tue Sep 17 17:31:34 2013 +0200
+
+ Handle more pecan REST method
+
+ This change adds support to get and put method.
+ And allows to use any verbs for custom method.
+
+commit a382d6fceafb19357864aa826f913e210df2144a
+Merge: fb6926d 3386b28
+Author: Doug Hellmann
+Date: Fri Sep 13 12:47:58 2013 -0700
+
+ Merge pull request #3 from emonty/master
+
+ Update pbr usage past the world of d2to1
+
+commit 3386b289ea33394a4a75f9c3084d8ab1d60c3ea2
+Author: Monty Taylor
+Date: Fri Sep 13 11:31:16 2013 -0500
+
+ Update pbr usage past the world of d2to1
+
+commit fb6926d98ebe65a4fd5de8095764e16985dd5155
+Author: Doug Hellmann
+Date: Tue May 14 17:10:03 2013 -0400
+
+ Add basic support for POST directives
+
+ This support only works with the RestController post()
+ method if the method just uses a 'body' argument.
+
+ Change-Id: I4e9a3b93e0babfbec869ac1db056c8652ebebedc
+ Signed-off-by: Doug Hellmann
+
+commit 6c3c079d1e615d30bd2fbf9f9d025de669ede5f3
+Author: Doug Hellmann
+Date: Tue May 14 16:33:36 2013 -0400
+
+ Import extension from ceilometer
+
+ The original version of this extension was part of the
+ ceilometer code base at https://github.com/openstack/ceilometer.
+ It is being moved to its own package to make it easier to
+ reuse with other OpenStack components.
+
+ Change-Id: I9cfc2ee84c8b0a918dbcb59a8a5b8a3cb2bce044
+ Signed-off-by: Doug Hellmann
+
+commit b1a6624f45a3c965a58d83f18e6fca1f0ddf426e
+Author: Doug Hellmann
+Date: Tue May 14 13:09:01 2013 -0700
+
+ Initial commit
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-pecanwsme-0.2/PKG-INFO new/sphinxcontrib-pecanwsme-0.5/PKG-INFO
--- old/sphinxcontrib-pecanwsme-0.2/PKG-INFO 2013-05-14 23:11:47.000000000 +0200
+++ new/sphinxcontrib-pecanwsme-0.5/PKG-INFO 2013-10-02 14:41:58.000000000 +0200
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: sphinxcontrib-pecanwsme
-Version: 0.2
+Version: 0.5
Summary: Extension to Sphinx for documenting APIs built with Pecan and WSME
Home-page: https://github.com/dreamhost/sphinxcontrib-pecanwsme
Author: Doug Hellmann
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-pecanwsme-0.2/announce.rst new/sphinxcontrib-pecanwsme-0.5/announce.rst
--- old/sphinxcontrib-pecanwsme-0.2/announce.rst 1970-01-01 01:00:00.000000000 +0100
+++ new/sphinxcontrib-pecanwsme-0.5/announce.rst 2013-10-02 14:39:56.000000000 +0200
@@ -0,0 +1,18 @@
+=============================
+ sphinxcontrib-pecanwsme 0.5
+=============================
+
+.. tags:: sphinxcontrib-pecanwsme pecan WSME sphinx release
+
+sphinxcontrib-pecanwsme is an extension to Sphinx for documenting APIs
+built with the Pecan_ web framework and WSME_.
+
+.. _Pecan: http://pecanpy.org/
+.. _WSME: https://pypi.python.org/pypi/WSME
+
+What's New?
+===========
+
+- Add support for extracting documentation from custom controller
+ methods with name that include the HTTP verb. (contributed by Mehdi
+ Abaakouk)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-pecanwsme-0.2/setup.cfg new/sphinxcontrib-pecanwsme-0.5/setup.cfg
--- old/sphinxcontrib-pecanwsme-0.2/setup.cfg 2013-05-14 23:11:47.000000000 +0200
+++ new/sphinxcontrib-pecanwsme-0.5/setup.cfg 2013-10-02 14:41:58.000000000 +0200
@@ -23,14 +23,9 @@
[files]
packages =
sphinxcontrib
- sphinxcontrib.pecanwsme
namespace_packages =
sphinxcontrib
-[global]
-setup-hooks =
- pbr.hooks.setup_hook
-
[egg_info]
tag_build =
tag_date = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-pecanwsme-0.2/setup.py new/sphinxcontrib-pecanwsme-0.5/setup.py
--- old/sphinxcontrib-pecanwsme-0.2/setup.py 2013-05-14 22:11:27.000000000 +0200
+++ new/sphinxcontrib-pecanwsme-0.5/setup.py 2013-09-13 21:50:14.000000000 +0200
@@ -4,6 +4,6 @@
setup(
- setup_requires=['d2to1', 'pbr'],
- d2to1=True,
+ setup_requires=['pbr'],
+ pbr=True,
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-pecanwsme-0.2/sphinxcontrib/pecanwsme/rest.py new/sphinxcontrib-pecanwsme-0.5/sphinxcontrib/pecanwsme/rest.py
--- old/sphinxcontrib-pecanwsme-0.2/sphinxcontrib/pecanwsme/rest.py 2013-05-14 23:07:18.000000000 +0200
+++ new/sphinxcontrib-pecanwsme-0.5/sphinxcontrib/pecanwsme/rest.py 2013-09-23 22:36:04.000000000 +0200
@@ -110,7 +110,7 @@
docstring.append(blank_line)
directive = http_directive(http_method, path, docstring)
- return (line for line in directive)
+ return directive
def make_rst_for_controller(self, path_prefix, controller):
env = self.state.document.settings.env
@@ -136,39 +136,76 @@
first_arg_name = argspec[0][1]
controller_path += '(' + first_arg_name + ')/'
- if hasattr(controller, 'get_all') and controller.get_all.exposed:
- app.info(' Method: get_all')
- for line in self.make_rst_for_method(controller_path,
- controller.get_all,
- 'get'):
- yield line
+ lines = []
+ for method_name, http_method_name in [('get_all', 'get'),
+ ('get', 'get'),
+ ]:
+ app.info('Checking %s for %s method' % (controller, method_name))
+ method = getattr(controller, method_name, None)
+ if method and method.exposed:
+ app.info('Found method: %s' % method_name)
+ lines.extend(
+ self.make_rst_for_method(
+ controller_path,
+ method,
+ http_method_name,
+ )
+ )
+
+ # Handle the special case for get_one(). The path should
+ # include the name of the argument used to find the object.
if hasattr(controller, 'get_one') and controller.get_one.exposed:
- app.info(' Method: %s' % controller.get_one)
+ app.info('Found method: get_one')
funcdef = controller.get_one._wsme_definition
first_arg_name = funcdef.arguments[0].name
path = controller_path + '(' + first_arg_name + ')/'
- for line in self.make_rst_for_method(
+ lines.extend(
+ self.make_rst_for_method(
path,
controller.get_one,
- 'get'):
- yield line
-
- if hasattr(controller, 'post') and controller.post.exposed:
- app.info(' Method: %s' % controller.post)
- for line in self.make_rst_for_method(
- controller_path,
- controller.post,
- 'post'):
- yield line
+ 'get',
+ )
+ )
+
+ for method_name, http_method_name in [('post', 'post'),
+ ('put', 'put'),
+ ]:
+ app.info('Checking %s for %s method' % (controller, method_name))
+ method = getattr(controller, method_name, None)
+ if method and method.exposed:
+ app.info('Found method: %s' % method_name)
+ lines.extend(
+ self.make_rst_for_method(
+ controller_path,
+ method,
+ http_method_name,
+ )
+ )
# Look for exposed custom methods
for name in sorted(controller._custom_actions.keys()):
- app.info(' Method: %s' % name)
- method = getattr(controller, name)
+ app.info('Adding custom method: %s' % name)
path = controller_path + name + '/'
- for line in self.make_rst_for_method(path, method, 'get'): # FIXME
- yield line
+ actions = controller._custom_actions[name]
+ for action in actions:
+ # Check for a method prefixed with the HTTP verb
+ # otherwise use the method with only the action name
+ method_name = "%s_%s" % (action.lower(), name)
+ if hasattr(controller, method_name):
+ method = getattr(controller, method_name)
+ else:
+ method = getattr(controller, name)
+ app.info('Custom method %s uses action %s' % (method, action))
+ lines.extend(
+ self.make_rst_for_method(
+ path,
+ method,
+ action.lower(),
+ )
+ )
+
+ return lines
def run(self):
env = self.state.document.settings.env
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-pecanwsme-0.2/sphinxcontrib_pecanwsme.egg-info/PKG-INFO new/sphinxcontrib-pecanwsme-0.5/sphinxcontrib_pecanwsme.egg-info/PKG-INFO
--- old/sphinxcontrib-pecanwsme-0.2/sphinxcontrib_pecanwsme.egg-info/PKG-INFO 2013-05-14 23:11:47.000000000 +0200
+++ new/sphinxcontrib-pecanwsme-0.5/sphinxcontrib_pecanwsme.egg-info/PKG-INFO 2013-10-02 14:41:58.000000000 +0200
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: sphinxcontrib-pecanwsme
-Version: 0.2
+Version: 0.5
Summary: Extension to Sphinx for documenting APIs built with Pecan and WSME
Home-page: https://github.com/dreamhost/sphinxcontrib-pecanwsme
Author: Doug Hellmann
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-pecanwsme-0.2/sphinxcontrib_pecanwsme.egg-info/SOURCES.txt new/sphinxcontrib-pecanwsme-0.5/sphinxcontrib_pecanwsme.egg-info/SOURCES.txt
--- old/sphinxcontrib-pecanwsme-0.2/sphinxcontrib_pecanwsme.egg-info/SOURCES.txt 2013-05-14 23:11:47.000000000 +0200
+++ new/sphinxcontrib-pecanwsme-0.5/sphinxcontrib_pecanwsme.egg-info/SOURCES.txt 2013-10-02 14:41:58.000000000 +0200
@@ -1,6 +1,8 @@
-.gitignore
+AUTHORS
+ChangeLog
LICENSE
README.rst
+announce.rst
requirements.txt
setup.cfg
setup.py
@@ -10,5 +12,7 @@
sphinxcontrib_pecanwsme.egg-info/PKG-INFO
sphinxcontrib_pecanwsme.egg-info/SOURCES.txt
sphinxcontrib_pecanwsme.egg-info/dependency_links.txt
+sphinxcontrib_pecanwsme.egg-info/namespace_packages.txt
+sphinxcontrib_pecanwsme.egg-info/not-zip-safe
sphinxcontrib_pecanwsme.egg-info/requires.txt
sphinxcontrib_pecanwsme.egg-info/top_level.txt
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-pecanwsme-0.2/sphinxcontrib_pecanwsme.egg-info/namespace_packages.txt new/sphinxcontrib-pecanwsme-0.5/sphinxcontrib_pecanwsme.egg-info/namespace_packages.txt
--- old/sphinxcontrib-pecanwsme-0.2/sphinxcontrib_pecanwsme.egg-info/namespace_packages.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/sphinxcontrib-pecanwsme-0.5/sphinxcontrib_pecanwsme.egg-info/namespace_packages.txt 2013-10-02 14:41:58.000000000 +0200
@@ -0,0 +1 @@
+sphinxcontrib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-pecanwsme-0.2/sphinxcontrib_pecanwsme.egg-info/not-zip-safe new/sphinxcontrib-pecanwsme-0.5/sphinxcontrib_pecanwsme.egg-info/not-zip-safe
--- old/sphinxcontrib-pecanwsme-0.2/sphinxcontrib_pecanwsme.egg-info/not-zip-safe 1970-01-01 01:00:00.000000000 +0100
+++ new/sphinxcontrib-pecanwsme-0.5/sphinxcontrib_pecanwsme.egg-info/not-zip-safe 2013-09-13 21:50:28.000000000 +0200
@@ -0,0 +1 @@
+
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
