Hello community, here is the log from the commit of package python-warlock for openSUSE:Factory checked in at 2014-09-17 17:27:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-warlock (Old) and /work/SRC/openSUSE:Factory/.python-warlock.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-warlock" Changes: -------- --- /work/SRC/openSUSE:Factory/python-warlock/python-warlock.changes 2013-10-25 11:34:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-warlock.new/python-warlock.changes 2014-09-17 17:27:30.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Sep 16 13:25:54 UTC 2014 - [email protected] + +- update to version 1.1.0: + * Bump version to 1.1.0 + * Merge pull request #12 from apevec/master + * LICENSE.txt was missing in the source tarball + * Merge pull request #11 from isethi/validation + * Add description to exception messages + * Add python3 support +- Add python-to as BuildRequires and Requires. + +------------------------------------------------------------------- Old: ---- warlock-1.0.1.tar.gz New: ---- warlock-1.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-warlock.spec ++++++ --- /var/tmp/diff_new_pack.LJNe97/_old 2014-09-17 17:27:31.000000000 +0200 +++ /var/tmp/diff_new_pack.LJNe97/_new 2014-09-17 17:27:31.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-warlock # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-warlock -Version: 1.0.1 +Version: 1.1.0 Release: 0 Summary: Python object model built on top of JSON schema License: Apache-2.0 @@ -29,8 +29,10 @@ BuildRequires: python-jsonschema BuildRequires: python-nose BuildRequires: python-setuptools +BuildRequires: python-six Requires: python-jsonpatch >= 0.7 Requires: python-jsonschema >= 0.10 +Requires: python-six BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} ++++++ warlock-1.0.1.tar.gz -> warlock-1.1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warlock-1.0.1/LICENSE.txt new/warlock-1.1.0/LICENSE.txt --- old/warlock-1.0.1/LICENSE.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/warlock-1.1.0/LICENSE.txt 2013-11-19 16:00:43.000000000 +0100 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warlock-1.0.1/MANIFEST.in new/warlock-1.1.0/MANIFEST.in --- old/warlock-1.0.1/MANIFEST.in 2013-06-22 19:37:37.000000000 +0200 +++ new/warlock-1.1.0/MANIFEST.in 2013-11-19 16:00:43.000000000 +0100 @@ -1,4 +1,4 @@ -include LICENSE +include LICENSE.txt include README.md include requirements.txt include setup.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warlock-1.0.1/PKG-INFO new/warlock-1.1.0/PKG-INFO --- old/warlock-1.0.1/PKG-INFO 2013-06-28 18:48:47.000000000 +0200 +++ new/warlock-1.1.0/PKG-INFO 2013-11-19 16:08:08.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: warlock -Version: 1.0.1 +Version: 1.1.0 Summary: Python object model built on JSON schema and JSON patch. Home-page: http://github.com/bcwaldon/warlock Author: Brian Waldon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warlock-1.0.1/requirements.txt new/warlock-1.1.0/requirements.txt --- old/warlock-1.0.1/requirements.txt 2013-06-28 18:41:28.000000000 +0200 +++ new/warlock-1.1.0/requirements.txt 2013-11-19 16:00:43.000000000 +0100 @@ -1,2 +1,3 @@ jsonschema>=0.7,<3 jsonpatch>=0.10,<2 +six diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warlock-1.0.1/setup.py new/warlock-1.1.0/setup.py --- old/warlock-1.0.1/setup.py 2013-06-28 18:47:15.000000000 +0200 +++ new/warlock-1.1.0/setup.py 2013-11-19 16:04:21.000000000 +0100 @@ -24,7 +24,7 @@ setuptools.setup( name='warlock', - version='1.0.1', + version='1.1.0', description='Python object model built on JSON schema and JSON patch.', author='Brian Waldon', author_email='[email protected]', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warlock-1.0.1/test/test_core.py new/warlock-1.1.0/test/test_core.py --- old/warlock-1.0.1/test/test_core.py 2013-06-23 17:21:23.000000000 +0200 +++ new/warlock-1.1.0/test/test_core.py 2013-11-19 16:00:43.000000000 +0100 @@ -15,6 +15,8 @@ import copy import unittest +import six + import warlock @@ -44,7 +46,7 @@ def test_class_name_from_unicode_schema_name(self): fixture_copy = copy.deepcopy(fixture) - fixture_copy['name'] = unicode(fixture_copy['name']) + fixture_copy['name'] = six.text_type(fixture_copy['name']) # Can't set class.__name__ to a unicode object, ensure warlock # does some magic to make it possible warlock.model_factory(fixture_copy) @@ -81,7 +83,7 @@ def test_items(self): Country = warlock.model_factory(fixture) sweden = Country(name='Sweden', population=9379116) - self.assertEqual(set(list(sweden.iteritems())), + self.assertEqual(set(list(six.iteritems(sweden))), set([('name', 'Sweden'), ('population', 9379116)])) self.assertEqual(set(sweden.items()), set([('name', 'Sweden'), ('population', 9379116)])) @@ -104,7 +106,7 @@ mike_1['sub']['foo'] = 'james' self.assertEquals(mike.sub['foo'], 'mike') - mike_2 = dict(mike.iteritems()) + mike_2 = dict(six.iteritems(mike)) mike_2['sub']['foo'] = 'james' self.assertEquals(mike.sub['foo'], 'mike') @@ -112,7 +114,7 @@ mike_2['sub']['foo'] = 'james' self.assertEquals(mike.sub['foo'], 'mike') - mike_3_sub = list(mike.itervalues())[0] + mike_3_sub = list(six.itervalues(mike))[0] mike_3_sub['foo'] = 'james' self.assertEquals(mike.sub['foo'], 'mike') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warlock-1.0.1/warlock/core.py new/warlock-1.1.0/warlock/core.py --- old/warlock-1.0.1/warlock/core.py 2013-06-22 19:37:37.000000000 +0200 +++ new/warlock-1.1.0/warlock/core.py 2013-11-19 16:00:43.000000000 +0100 @@ -16,7 +16,7 @@ import copy -import model +from . import model def model_factory(schema, base_class=model.Model): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warlock-1.0.1/warlock/model.py new/warlock-1.1.0/warlock/model.py --- old/warlock-1.0.1/warlock/model.py 2013-06-22 19:37:37.000000000 +0200 +++ new/warlock-1.1.0/warlock/model.py 2013-11-19 16:00:43.000000000 +0100 @@ -19,8 +19,9 @@ import jsonpatch import jsonschema +import six -import exceptions +from . import exceptions class Model(dict): @@ -43,8 +44,9 @@ mutation[key] = value try: self.validate(mutation) - except exceptions.ValidationError: - msg = "Unable to set '%s' to '%s'" % (key, value) + except exceptions.ValidationError as exc: + msg = ("Unable to set '%s' to '%s'. Reason: %s" + % (key, value, str(exc))) raise exceptions.InvalidOperation(msg) dict.__setitem__(self, key, value) @@ -56,8 +58,9 @@ del mutation[key] try: self.validate(mutation) - except exceptions.ValidationError: - msg = "Unable to delete attribute '%s'" % (key) + except exceptions.ValidationError as exc: + msg = ("Unable to delete attribute '%s'. Reason: %s" + % (key, str(exc))) raise exceptions.InvalidOperation(msg) dict.__delitem__(self, key) @@ -98,13 +101,13 @@ dict.update(self, other) def iteritems(self): - return copy.deepcopy(dict(self)).iteritems() + return six.iteritems(copy.deepcopy(dict(self))) def items(self): return copy.deepcopy(dict(self)).items() def itervalues(self): - return copy.deepcopy(dict(self)).itervalues() + return six.itervalues(copy.deepcopy(dict(self))) def values(self): return copy.deepcopy(dict(self)).values() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warlock-1.0.1/warlock.egg-info/PKG-INFO new/warlock-1.1.0/warlock.egg-info/PKG-INFO --- old/warlock-1.0.1/warlock.egg-info/PKG-INFO 2013-06-28 18:48:47.000000000 +0200 +++ new/warlock-1.1.0/warlock.egg-info/PKG-INFO 2013-11-19 16:08:08.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: warlock -Version: 1.0.1 +Version: 1.1.0 Summary: Python object model built on JSON schema and JSON patch. Home-page: http://github.com/bcwaldon/warlock Author: Brian Waldon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warlock-1.0.1/warlock.egg-info/SOURCES.txt new/warlock-1.1.0/warlock.egg-info/SOURCES.txt --- old/warlock-1.0.1/warlock.egg-info/SOURCES.txt 2013-06-28 18:48:47.000000000 +0200 +++ new/warlock-1.1.0/warlock.egg-info/SOURCES.txt 2013-11-19 16:08:08.000000000 +0100 @@ -1,3 +1,4 @@ +LICENSE.txt MANIFEST.in README.md requirements.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warlock-1.0.1/warlock.egg-info/requires.txt new/warlock-1.1.0/warlock.egg-info/requires.txt --- old/warlock-1.0.1/warlock.egg-info/requires.txt 2013-06-28 18:48:47.000000000 +0200 +++ new/warlock-1.1.0/warlock.egg-info/requires.txt 2013-11-19 16:08:08.000000000 +0100 @@ -1,2 +1,3 @@ jsonschema>=0.7,<3 -jsonpatch>=0.10,<2 \ No newline at end of file +jsonpatch>=0.10,<2 +six \ No newline at end of file -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
