Hello community,
here is the log from the commit of package python-jsondiff for
openSUSE:Leap:15.2 checked in at 2020-03-09 18:06:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/python-jsondiff (Old)
and /work/SRC/openSUSE:Leap:15.2/.python-jsondiff.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-jsondiff"
Mon Mar 9 18:06:59 2020 rev:3 rq:776705 version:1.2.0
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/python-jsondiff/python-jsondiff.changes
2020-01-15 15:49:31.403463093 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.python-jsondiff.new.26092/python-jsondiff.changes
2020-03-09 18:07:05.848869102 +0100
@@ -1,0 +2,26 @@
+Fri Oct 4 15:22:38 UTC 2019 - Marketa Calabkova <[email protected]>
+
+- Update to version 1.2.0
+ * Deprecate the jsondiff command due to conflicts with json-patch
+
+-------------------------------------------------------------------
+Sun Jun 2 20:34:43 UTC 2019 - Jan Engelhardt <[email protected]>
+
+- Use noun phrase in summary.
+
+-------------------------------------------------------------------
+Fri May 17 21:48:19 UTC 2019 - Scott Wulf <[email protected]>
+
+- 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 <[email protected]>
+
+- Upgraded to 1.1.2
+ * no changelog available
+
+-------------------------------------------------------------------
Old:
----
jsondiff-1.1.1.tar.gz
New:
----
jsondiff-1.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-jsondiff.spec ++++++
--- /var/tmp/diff_new_pack.wnFGqs/_old 2020-03-09 18:07:06.204869279 +0100
+++ /var/tmp/diff_new_pack.wnFGqs/_new 2020-03-09 18:07:06.204869279 +0100
@@ -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,27 +12,24 @@
# 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.2.0
Release: 0
-Summary: Diff JSON and JSON-like structures in Python
+Summary: Module to diff JSON and JSON-like structures in Python
License: MIT
-Group: Development/Languages/Python
URL: https://github.com/ZoomerAnalytics/jsondiff
Source:
https://files.pythonhosted.org/packages/source/j/jsondiff/jsondiff-%{version}.tar.gz
+BuildRequires: %{python_module nose-random}
BuildRequires: %{python_module nose}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-setuptools
-# provides the same jsondiff binary
-Conflicts: python2-jsonpatch
-Conflicts: python3-jsonpatch
BuildArch: noarch
%python_subpackages
@@ -50,13 +47,13 @@
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
-# Tests do not run in py3 and upstream is not much worried about that
-#%%python_expand nosetests-%{$python_bin_suffix}
+%python_expand nosetests-%{$python_bin_suffix}
%files %{python_files}
%license LICENSE
%doc README.rst
%{python_sitelib}/*
+%python3_only %{_bindir}/jdiff
%python3_only %{_bindir}/jsondiff
%changelog
++++++ jsondiff-1.1.1.tar.gz -> jsondiff-1.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.1.1/PKG-INFO new/jsondiff-1.2.0/PKG-INFO
--- old/jsondiff-1.1.1/PKG-INFO 2017-03-26 13:05:06.000000000 +0200
+++ new/jsondiff-1.2.0/PKG-INFO 2019-06-23 17:14:39.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: jsondiff
-Version: 1.1.1
+Version: 1.2.0
Summary: Diff JSON and JSON-like structures in Python
Home-page: https://github.com/ZoomerAnalytics/jsondiff
Author: Zoomer Analytics LLC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.1.1/README.rst
new/jsondiff-1.2.0/README.rst
--- old/jsondiff-1.1.1/README.rst 2016-12-05 10:57:24.000000000 +0100
+++ new/jsondiff-1.2.0/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.2.0/jsondiff/__init__.py
--- old/jsondiff-1.1.1/jsondiff/__init__.py 2017-03-26 13:04:14.000000000
+0200
+++ new/jsondiff-1.2.0/jsondiff/__init__.py 2019-06-23 17:09:31.000000000
+0200
@@ -1,4 +1,4 @@
-__version__ = '1.1.1'
+__version__ = '1.2.0'
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/cli.py
new/jsondiff-1.2.0/jsondiff/cli.py
--- old/jsondiff-1.1.1/jsondiff/cli.py 2016-12-05 10:23:30.000000000 +0100
+++ new/jsondiff-1.2.0/jsondiff/cli.py 2019-06-23 17:09:06.000000000 +0200
@@ -1,6 +1,7 @@
import argparse
import jsondiff
import json
+import warnings
import sys
def main():
@@ -35,6 +36,9 @@
json.dump(x, sys.stdout, indent=args.indent)
+def main_deprecated():
+ warnings.warn("jsondiff is deprecated. Use jdiff instead.",
DeprecationWarning)
+ main()
if __name__ == '__main__':
main()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.1.1/jsondiff.egg-info/PKG-INFO
new/jsondiff-1.2.0/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.2.0/jsondiff.egg-info/PKG-INFO 2019-06-23
17:14:39.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: jsondiff
-Version: 1.1.1
+Version: 1.2.0
Summary: Diff JSON and JSON-like structures in Python
Home-page: https://github.com/ZoomerAnalytics/jsondiff
Author: Zoomer Analytics LLC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.1.1/jsondiff.egg-info/entry_points.txt
new/jsondiff-1.2.0/jsondiff.egg-info/entry_points.txt
--- old/jsondiff-1.1.1/jsondiff.egg-info/entry_points.txt 2017-03-26
13:05:06.000000000 +0200
+++ new/jsondiff-1.2.0/jsondiff.egg-info/entry_points.txt 2019-06-23
17:14:39.000000000 +0200
@@ -1,3 +1,4 @@
[console_scripts]
-jsondiff = jsondiff.cli:main
+jdiff = jsondiff.cli:main
+jsondiff = jsondiff.cli:main_deprecated
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.1.1/setup.cfg new/jsondiff-1.2.0/setup.cfg
--- old/jsondiff-1.1.1/setup.cfg 2017-03-26 13:05:06.000000000 +0200
+++ new/jsondiff-1.2.0/setup.cfg 2019-06-23 17:14:39.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/setup.py new/jsondiff-1.2.0/setup.py
--- old/jsondiff-1.1.1/setup.py 2017-03-26 13:00:13.000000000 +0200
+++ new/jsondiff-1.2.0/setup.py 2019-06-23 17:09:06.000000000 +0200
@@ -21,7 +21,8 @@
],
entry_points={
'console_scripts': [
- 'jsondiff=jsondiff.cli:main'
+ 'jsondiff=jsondiff.cli:main_deprecated',
+ 'jdiff=jsondiff.cli:main'
]
}
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.1.1/tests/generate_readme.py
new/jsondiff-1.2.0/tests/generate_readme.py
--- old/jsondiff-1.1.1/tests/generate_readme.py 2015-12-04 16:37:44.000000000
+0100
+++ new/jsondiff-1.2.0/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")
