From 12d18be93db12764b010b74ff215c6d0874ffd61a09238a9350869a4fe797af4 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 18 Sep 2013 14:55:20 +0000 Subject: [PATCH 1/2] Accepting request 199644 from Cloud:OpenStack:Master - (Build)Require python-ordereddict on SP3 - update to 0.5b5: * More packaging fixes. * Allow non-default status code return with the pecan adapter * Fix returning objects with object attributes set to None on rest-json * Allow error details to be set on the Response object (experimental !). * Fix: Content-Type header is not set anymore when the return type is None on the pecan adapter. * Use pbr instead of d2to1 (Julien Danjou). * six >= 1.4.0 support (Julien Danjou). OBS-URL: https://build.opensuse.org/request/show/199644 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-WSME?expand=0&rev=8 --- WSME-0.5b2.tar.gz | 3 --- WSME-0.5b5.tar.gz | 3 +++ python-WSME.changes | 18 ++++++++++++++++++ python-WSME.spec | 8 ++++---- six-14-support.diff | 17 ----------------- 5 files changed, 25 insertions(+), 24 deletions(-) delete mode 100644 WSME-0.5b2.tar.gz create mode 100644 WSME-0.5b5.tar.gz delete mode 100644 six-14-support.diff diff --git a/WSME-0.5b2.tar.gz b/WSME-0.5b2.tar.gz deleted file mode 100644 index ce049e5..0000000 --- a/WSME-0.5b2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a73e0d0454969e1eab643f30935a71967745127255315df12eead10cb445698e -size 77573 diff --git a/WSME-0.5b5.tar.gz b/WSME-0.5b5.tar.gz new file mode 100644 index 0000000..3ab4765 --- /dev/null +++ b/WSME-0.5b5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d8bf27e78d4c701c10a1f0047f4cf7e375ffc458bf88bb10a12efb98695be1a +size 138332 diff --git a/python-WSME.changes b/python-WSME.changes index ec3c955..8205caf 100644 --- a/python-WSME.changes +++ b/python-WSME.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Sep 18 14:54:07 UTC 2013 - speilicke@suse.com + +- (Build)Require python-ordereddict on SP3 + +------------------------------------------------------------------- +Tue Sep 17 18:51:10 UTC 2013 - dmueller@suse.com + +- update to 0.5b5: + * More packaging fixes. + * Allow non-default status code return with the pecan adapter + * Fix returning objects with object attributes set to None on rest-json + * Allow error details to be set on the Response object (experimental !). + * Fix: Content-Type header is not set anymore when the return type is None + on the pecan adapter. + * Use pbr instead of d2to1 (Julien Danjou). + * six >= 1.4.0 support (Julien Danjou). + ------------------------------------------------------------------- Mon Sep 2 16:29:37 UTC 2013 - dmueller@suse.com diff --git a/python-WSME.spec b/python-WSME.spec index f66962c..803fbcc 100644 --- a/python-WSME.spec +++ b/python-WSME.spec @@ -17,18 +17,17 @@ Name: python-WSME -Version: 0.5b2 +Version: 0.5b5 Release: 0 Summary: Web Services Made Easy License: MIT Group: Development/Languages/Python Url: http://packages.python.org/WSME/ Source: http://pypi.python.org/packages/source/W/WSME/WSME-%{version}.tar.gz -Patch0: six-14-support.diff BuildRequires: python-WebOb -BuildRequires: python-d2to1 BuildRequires: python-devel BuildRequires: python-distribute +BuildRequires: python-pbr BuildRequires: python-simplegeneric BuildRequires: python-six Requires: python-WebOb @@ -36,6 +35,8 @@ Requires: python-simplegeneric Requires: python-six BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 +BuildRequires: python-ordereddict +Requires: python-ordereddict %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch @@ -49,7 +50,6 @@ with focus on extensibility, framework-independance and better type handling. %prep %setup -q -n WSME-%{version} -%patch0 %build python setup.py build diff --git a/six-14-support.diff b/six-14-support.diff deleted file mode 100644 index f638bc8..0000000 --- a/six-14-support.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- wsme/types.py -+++ wsme/types.py -@@ -573,12 +573,12 @@ - - class BaseMeta(type): - def __new__(cls, name, bases, dct): -- if bases[0] is not object and '__registry__' not in dct: -+ if bases and bases[0] is not object and '__registry__' not in dct: - dct['__registry__'] = registry - return type.__new__(cls, name, bases, dct) - - def __init__(cls, name, bases, dct): -- if bases[0] is not object: -+ if bases and bases[0] is not object: - cls.__registry__.register(cls) - - From 5ca7d8a6ccee0116b54a02993497f771d33466e8d73afb7963c4c234bd951097 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 25 Sep 2013 14:31:26 +0000 Subject: [PATCH 2/2] - Drop six-14-support.diff: Merged upstream OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-WSME?expand=0&rev=9 --- python-WSME.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/python-WSME.changes b/python-WSME.changes index 8205caf..817c865 100644 --- a/python-WSME.changes +++ b/python-WSME.changes @@ -15,6 +15,7 @@ Tue Sep 17 18:51:10 UTC 2013 - dmueller@suse.com on the pecan adapter. * Use pbr instead of d2to1 (Julien Danjou). * six >= 1.4.0 support (Julien Danjou). +- Drop six-14-support.diff: Merged upstream ------------------------------------------------------------------- Mon Sep 2 16:29:37 UTC 2013 - dmueller@suse.com