Hello community,
here is the log from the commit of package python-jsondiff for openSUSE:Factory
checked in at 2019-05-22 15:39:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-jsondiff (Old)
and /work/SRC/openSUSE:Factory/.python-jsondiff.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-jsondiff"
Wed May 22 15:39:39 2019 rev:2 rq:703808 version:1.1.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-jsondiff/python-jsondiff.changes
2018-05-16 18:35:20.928848888 +0200
+++
/work/SRC/openSUSE:Factory/.python-jsondiff.new.5148/python-jsondiff.changes
2019-05-22 15:39:40.714492711 +0200
@@ -1,0 +2,15 @@
+Fri May 17 21:48:19 UTC 2019 - Scott Wulf <sw...@suse.com>
+
+- Removing conflict with jsonpatch
+ * Reasoning:
+ - moto requires cfn-lint and jsondiff
+ - cfn-lint requires jsonpatch
+
+
+-------------------------------------------------------------------
+Tue May 14 22:18:30 UTC 2019 - Gary Smith <gsm...@suse.com>
+
+- Upgraded to 1.1.2
+ * no changelog available
+
+-------------------------------------------------------------------
Old:
----
jsondiff-1.1.1.tar.gz
New:
----
jsondiff-1.1.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-jsondiff.spec ++++++
--- /var/tmp/diff_new_pack.imvaYg/_old 2019-05-22 15:39:41.266491377 +0200
+++ /var/tmp/diff_new_pack.imvaYg/_new 2019-05-22 15:39:41.270491367 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-jsondiff
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,13 +12,13 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-jsondiff
-Version: 1.1.1
+Version: 1.1.2
Release: 0
Summary: Diff JSON and JSON-like structures in Python
License: MIT
@@ -30,9 +30,6 @@
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-setuptools
-# provides the same jsondiff binary
-Conflicts: python2-jsonpatch
-Conflicts: python3-jsonpatch
BuildArch: noarch
%python_subpackages
++++++ jsondiff-1.1.1.tar.gz -> jsondiff-1.1.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.1.1/PKG-INFO new/jsondiff-1.1.2/PKG-INFO
--- old/jsondiff-1.1.1/PKG-INFO 2017-03-26 13:05:06.000000000 +0200
+++ new/jsondiff-1.1.2/PKG-INFO 2018-05-31 23:45:46.000000000 +0200
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: jsondiff
-Version: 1.1.1
+Version: 1.1.2
Summary: Diff JSON and JSON-like structures in Python
Home-page: https://github.com/ZoomerAnalytics/jsondiff
Author: Zoomer Analytics LLC
Author-email: eric.reyno...@zoomeranalytics.com
License: UNKNOWN
+Description-Content-Type: UNKNOWN
Description: UNKNOWN
Keywords: json,diff,diffing,difference,patch,delta,dict,LCS
Platform: UNKNOWN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.1.1/README.rst
new/jsondiff-1.1.2/README.rst
--- old/jsondiff-1.1.1/README.rst 2016-12-05 10:57:24.000000000 +0100
+++ new/jsondiff-1.1.2/README.rst 2018-05-31 23:40:55.000000000 +0200
@@ -51,9 +51,7 @@
Command Line Client
-------------------
-Usage:
-
-.. code-block:: bash
+Usage::
jsondiff [-h] [-p] [-s SYNTAX] [-i INDENT] first second
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.1.1/jsondiff/__init__.py
new/jsondiff-1.1.2/jsondiff/__init__.py
--- old/jsondiff-1.1.1/jsondiff/__init__.py 2017-03-26 13:04:14.000000000
+0200
+++ new/jsondiff-1.1.2/jsondiff/__init__.py 2018-05-31 23:41:25.000000000
+0200
@@ -1,4 +1,4 @@
-__version__ = '1.1.1'
+__version__ = '1.1.2'
import sys
import json
@@ -480,7 +480,7 @@
def _obj_diff(self, a, b):
if a is b:
return self.options.syntax.emit_value_diff(a, b, 1.0), 1.0
- if type(a) is dict and type(b) is dict:
+ if isinstance(a, dict) and isinstance(b, dict):
return self._dict_diff(a, b)
elif isinstance(a, tuple) and isinstance(b, tuple):
return self._list_diff(a, b)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.1.1/jsondiff.egg-info/PKG-INFO
new/jsondiff-1.1.2/jsondiff.egg-info/PKG-INFO
--- old/jsondiff-1.1.1/jsondiff.egg-info/PKG-INFO 2017-03-26
13:05:06.000000000 +0200
+++ new/jsondiff-1.1.2/jsondiff.egg-info/PKG-INFO 2018-05-31
23:45:46.000000000 +0200
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: jsondiff
-Version: 1.1.1
+Version: 1.1.2
Summary: Diff JSON and JSON-like structures in Python
Home-page: https://github.com/ZoomerAnalytics/jsondiff
Author: Zoomer Analytics LLC
Author-email: eric.reyno...@zoomeranalytics.com
License: UNKNOWN
+Description-Content-Type: UNKNOWN
Description: UNKNOWN
Keywords: json,diff,diffing,difference,patch,delta,dict,LCS
Platform: UNKNOWN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.1.1/setup.cfg new/jsondiff-1.1.2/setup.cfg
--- old/jsondiff-1.1.1/setup.cfg 2017-03-26 13:05:06.000000000 +0200
+++ new/jsondiff-1.1.2/setup.cfg 2018-05-31 23:45:46.000000000 +0200
@@ -1,5 +1,4 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.1.1/tests/generate_readme.py
new/jsondiff-1.1.2/tests/generate_readme.py
--- old/jsondiff-1.1.1/tests/generate_readme.py 2015-12-04 16:37:44.000000000
+0100
+++ new/jsondiff-1.1.2/tests/generate_readme.py 2018-05-31 23:40:55.000000000
+0200
@@ -1,12 +1,14 @@
-# this file doesn't work in Py3 - but it's only used for generating the repo
front page
+# this is used for generating the repo front page
+
+from __future__ import print_function
def do(cmd, comment=None):
if comment:
- print "# " + comment
- print ">>> " + cmd
+ print("# " + comment)
+ print(">>> " + cmd)
c = compile(cmd, filename="<string>", mode='single')
eval(c, globals())
- print
+ print()
do('from jsondiff import diff')
@@ -26,5 +28,5 @@
do("diff({'a', 'b', 'c'}, {'a', 'c', 'd'})", "Special handling of sets")
-do("print diff('[\"a\", \"b\", \"c\"]', '[\"a\", \"c\", \"d\"]', load=True,
dump=True)", "Load and dump JSON")
+do("print(diff('[\"a\", \"b\", \"c\"]', '[\"a\", \"c\", \"d\"]', load=True,
dump=True))", "Load and dump JSON")
