Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-jsondiff for openSUSE:Factory
checked in at 2021-12-08 00:00:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-jsondiff (Old)
and /work/SRC/openSUSE:Factory/.python-jsondiff.new.31177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-jsondiff"
Wed Dec 8 00:00:07 2021 rev:7 rq:936286 version:1.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-jsondiff/python-jsondiff.changes
2020-09-14 12:31:43.853228839 +0200
+++
/work/SRC/openSUSE:Factory/.python-jsondiff.new.31177/python-jsondiff.changes
2021-12-08 00:00:37.687559594 +0100
@@ -1,0 +2,15 @@
+Tue Dec 7 09:32:07 UTC 2021 - John Paul Adrian Glaubitz
<adrian.glaub...@suse.com>
+
+- Update to version 1.3.0
+ * Update README.rst
+ * Add license to setup.py
+ * Upating travis config to explicitly set ubuntu versions to use
+ for each python version.
+ * Fix long list diffing bug by converting recursive code to iterative.
+ * Add failing test for list-diff recursion error bug
+- Refresh patches for new version
+ * remove_nose.patch
+- Switch Source field to point to Github tarball URL
+ * The tarball from PyPi does not contain the tests
+
+-------------------------------------------------------------------
Old:
----
jsondiff-1.2.0.tar.gz
New:
----
jsondiff-1.3.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-jsondiff.spec ++++++
--- /var/tmp/diff_new_pack.5QaxH1/_old 2021-12-08 00:00:38.355557308 +0100
+++ /var/tmp/diff_new_pack.5QaxH1/_new 2021-12-08 00:00:38.359557293 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-jsondiff
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,12 +18,12 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-jsondiff
-Version: 1.2.0
+Version: 1.3.0
Release: 0
Summary: Module to diff JSON and JSON-like structures in Python
License: MIT
URL: https://github.com/ZoomerAnalytics/jsondiff
-Source:
https://files.pythonhosted.org/packages/source/j/jsondiff/jsondiff-%{version}.tar.gz
+Source:
https://github.com/ZoomerAnalytics/jsondiff/archive/%{version}.tar.gz#/jsondiff-%{version}.tar.gz
# PATCH-FEATURE-UPSTREAM remove_nose.patch bsc#[0-9]+ mc...@suse.com
# Replace nose-random plugin with ripped of version independent of nose.
Patch0: remove_nose.patch
@@ -33,7 +33,7 @@
BuildRequires: python-rpm-macros
Requires: python-setuptools
Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
BuildArch: noarch
%python_subpackages
++++++ jsondiff-1.2.0.tar.gz -> jsondiff-1.3.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/.gitignore
new/jsondiff-1.3.0/.gitignore
--- old/jsondiff-1.2.0/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/jsondiff-1.3.0/.gitignore 2021-04-19 21:51:14.000000000 +0200
@@ -0,0 +1,60 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+# Usually these files are written by a python script from a template
+# before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# PyCharm
+.idea
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/.travis.yml
new/jsondiff-1.3.0/.travis.yml
--- old/jsondiff-1.2.0/.travis.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/jsondiff-1.3.0/.travis.yml 2021-04-19 21:51:14.000000000 +0200
@@ -0,0 +1,24 @@
+language: python
+
+matrix:
+ include:
+ - python: 2.7
+ dist: trusty
+ - python: 3.2
+ dist: trusty
+ - python: 3.3
+ dist: trusty
+ - python: 3.4
+ dist: xenial
+ - python: 3.5
+ dist: xenial
+ - python: 3.6
+ dist: xenial
+ - python: 3.7
+ dist: xenial
+
+install:
+ - pip install -r dev-requirements.txt
+ - python setup.py install
+
+script: nosetests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/CHANGELOG.md
new/jsondiff-1.3.0/CHANGELOG.md
--- old/jsondiff-1.2.0/CHANGELOG.md 1970-01-01 01:00:00.000000000 +0100
+++ new/jsondiff-1.3.0/CHANGELOG.md 2021-04-19 21:51:14.000000000 +0200
@@ -0,0 +1,21 @@
+# Changelog
+
+## v1.1.1 (Mar, 26th 2016)
+
+Exclude tests from installation
+
+## v1.1.0 (Dec, 5th 2016)
+
+Added command line client
+
+## v1.0.0 (Oct, 19th 2016)
+
+Stable release
+
+## v0.2.0 (Dec, 15th 2015)
+
+Changed syntax
+
+## v0.1.0 (Oct, 19th 2015)
+
+First release
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/PKG-INFO new/jsondiff-1.3.0/PKG-INFO
--- old/jsondiff-1.2.0/PKG-INFO 2019-06-23 17:14:39.000000000 +0200
+++ new/jsondiff-1.3.0/PKG-INFO 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-Metadata-Version: 1.1
-Name: jsondiff
-Version: 1.2.0
-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: UNKNOWN
-Keywords: json,diff,diffing,difference,patch,delta,dict,LCS
-Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/README.rst
new/jsondiff-1.3.0/README.rst
--- old/jsondiff-1.2.0/README.rst 2018-05-31 23:40:55.000000000 +0200
+++ new/jsondiff-1.3.0/README.rst 2021-04-19 21:51:14.000000000 +0200
@@ -71,4 +71,4 @@
$ jsondiff a.json b.json -i 2
- $ jsondiff a.json b.json -i 2 -s symmetric
\ No newline at end of file
+ $ jsondiff a.json b.json -i 2 -s symmetric
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/dev-requirements.txt
new/jsondiff-1.3.0/dev-requirements.txt
--- old/jsondiff-1.2.0/dev-requirements.txt 1970-01-01 01:00:00.000000000
+0100
+++ new/jsondiff-1.3.0/dev-requirements.txt 2021-04-19 21:51:14.000000000
+0200
@@ -0,0 +1,2 @@
+nose
+git+https://github.com/ZoomerAnalytics/nose-random.git
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/docs/Makefile
new/jsondiff-1.3.0/docs/Makefile
--- old/jsondiff-1.2.0/docs/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ new/jsondiff-1.3.0/docs/Makefile 2021-04-19 21:51:14.000000000 +0200
@@ -0,0 +1,192 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS =
+SPHINXBUILD = sphinx-build
+PAPER =
+BUILDDIR = _build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx
installed, then set the SPHINXBUILD environment variable to point to the full
path of the '$(SPHINXBUILD)' executable. Alternatively you can add the
directory with the executable to your PATH. If you don't have Sphinx installed,
grab it from http://sphinx-doc.org/)
+endif
+
+# Internal variables.
+PAPEROPT_a4 = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp
epub latex latexpdf text man changes linkcheck doctest coverage gettext
+
+help:
+ @echo "Please use \`make <target>' where <target> is one of"
+ @echo " html to make standalone HTML files"
+ @echo " dirhtml to make HTML files named index.html in directories"
+ @echo " singlehtml to make a single large HTML file"
+ @echo " pickle to make pickle files"
+ @echo " json to make JSON files"
+ @echo " htmlhelp to make HTML files and a HTML help project"
+ @echo " qthelp to make HTML files and a qthelp project"
+ @echo " applehelp to make an Apple Help Book"
+ @echo " devhelp to make HTML files and a Devhelp project"
+ @echo " epub to make an epub"
+ @echo " latex to make LaTeX files, you can set PAPER=a4 or
PAPER=letter"
+ @echo " latexpdf to make LaTeX files and run them through pdflatex"
+ @echo " latexpdfja to make LaTeX files and run them through
platex/dvipdfmx"
+ @echo " text to make text files"
+ @echo " man to make manual pages"
+ @echo " texinfo to make Texinfo files"
+ @echo " info to make Texinfo files and run them through makeinfo"
+ @echo " gettext to make PO message catalogs"
+ @echo " changes to make an overview of all changed/added/deprecated
items"
+ @echo " xml to make Docutils-native XML files"
+ @echo " pseudoxml to make pseudoxml-XML files for display purposes"
+ @echo " linkcheck to check all external links for integrity"
+ @echo " doctest to run all doctests embedded in the documentation
(if enabled)"
+ @echo " coverage to run coverage check of the documentation (if
enabled)"
+
+clean:
+ rm -rf $(BUILDDIR)/*
+
+html:
+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+ $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+ @echo
+ @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+ @echo
+ @echo "Build finished; now you can process the pickle files."
+
+json:
+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+ @echo
+ @echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+ @echo
+ @echo "Build finished; now you can run HTML Help Workshop with the" \
+ ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+ @echo
+ @echo "Build finished; now you can run "qcollectiongenerator" with the"
\
+ ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+ @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/jsondiff.qhcp"
+ @echo "To view the help file:"
+ @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/jsondiff.qhc"
+
+applehelp:
+ $(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
+ @echo
+ @echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
+ @echo "N.B. You won't be able to view it unless you put it in" \
+ "~/Library/Documentation/Help or install it in your application" \
+ "bundle."
+
+devhelp:
+ $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+ @echo
+ @echo "Build finished."
+ @echo "To view the help file:"
+ @echo "# mkdir -p $$HOME/.local/share/devhelp/jsondiff"
+ @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/jsondiff"
+ @echo "# devhelp"
+
+epub:
+ $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+ @echo
+ @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo
+ @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+ @echo "Run \`make' in that directory to run these through (pdf)latex" \
+ "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo "Running LaTeX files through pdflatex..."
+ $(MAKE) -C $(BUILDDIR)/latex all-pdf
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+latexpdfja:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo "Running LaTeX files through platex and dvipdfmx..."
+ $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+ $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+ @echo
+ @echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+ $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+ @echo
+ @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+ @echo
+ @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+ @echo "Run \`make' in that directory to run these through makeinfo" \
+ "(use \`make info' here to do that automatically)."
+
+info:
+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+ @echo "Running Texinfo files through makeinfo..."
+ make -C $(BUILDDIR)/texinfo info
+ @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+ $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+ @echo
+ @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+ @echo
+ @echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+ @echo
+ @echo "Link check complete; look for any errors in the above output " \
+ "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+ $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+ @echo "Testing of doctests in the sources finished, look at the " \
+ "results in $(BUILDDIR)/doctest/output.txt."
+
+coverage:
+ $(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+ @echo "Testing of coverage in the sources finished, look at the " \
+ "results in $(BUILDDIR)/coverage/python.txt."
+
+xml:
+ $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+ @echo
+ @echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+ $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+ @echo
+ @echo "Build finished. The pseudo-XML files are in
$(BUILDDIR)/pseudoxml."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/docs/basic_use.rst
new/jsondiff-1.3.0/docs/basic_use.rst
--- old/jsondiff-1.2.0/docs/basic_use.rst 1970-01-01 01:00:00.000000000
+0100
+++ new/jsondiff-1.3.0/docs/basic_use.rst 2021-04-19 21:51:14.000000000
+0200
@@ -0,0 +1,9 @@
+Basic Use
+=========
+
+Installation
+------------
+
+The first step is to install jsondiff, if you haven't already
+
+``pip install jsondiff``
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/docs/conf.py
new/jsondiff-1.3.0/docs/conf.py
--- old/jsondiff-1.2.0/docs/conf.py 1970-01-01 01:00:00.000000000 +0100
+++ new/jsondiff-1.3.0/docs/conf.py 2021-04-19 21:51:14.000000000 +0200
@@ -0,0 +1,284 @@
+# -*- coding: utf-8 -*-
+#
+# jsondiff documentation build configuration file, created by
+# sphinx-quickstart on Fri Nov 13 17:39:49 2015.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys
+import os
+import shlex
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = []
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'jsondiff'
+copyright = u'2015, Eric Reynolds'
+author = u'Eric Reynolds'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.1.0'
+# The full version, including alpha/beta/rc tags.
+release = '0.1.0'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages. See the documentation for
+# a list of builtin themes.
+#html_theme = 'alabaster'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further. For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents. If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar. Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#html_extra_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it. The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Language to be used for generating the HTML full-text search index.
+# Sphinx supports the following languages:
+# 'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
+# 'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
+#html_search_language = 'en'
+
+# A dictionary with options for the search language support, empty by default.
+# Now only 'ja' uses this config value
+#html_search_options = {'type': 'default'}
+
+# The name of a javascript file (relative to the configuration directory) that
+# implements a search results scorer. If empty, the default will be used.
+#html_search_scorer = 'scorer.js'
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'jsondiffdoc'
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+
+# Latex figure (float) alignment
+#'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+# author, documentclass [howto, manual, or own class]).
+latex_documents = [
+ (master_doc, 'jsondiff.tex', u'jsondiff Documentation',
+ u'Eric Reynolds', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+ (master_doc, 'jsondiff', u'jsondiff Documentation',
+ [author], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+# dir menu entry, description, category)
+texinfo_documents = [
+ (master_doc, 'jsondiff', u'jsondiff Documentation',
+ author, 'jsondiff', 'One line description of project.',
+ 'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#texinfo_no_detailmenu = False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/docs/index.rst
new/jsondiff-1.3.0/docs/index.rst
--- old/jsondiff-1.2.0/docs/index.rst 1970-01-01 01:00:00.000000000 +0100
+++ new/jsondiff-1.3.0/docs/index.rst 2021-04-19 21:51:14.000000000 +0200
@@ -0,0 +1,28 @@
+jsondiff
+========
+
+jsondiff is an MIT-licensed Python library which lets you compare, diff and
patch JSON and JSON-like structures in
+Python. It has special support for
+
+* multiple and custom-defined diff syntaxes
+* Python sets
+* similarity-based list comparison
+
+.. note:: jsondiff is currently in an early stage.
+ The API might change in backward incompatible ways.
+
+Contents:
+
+.. toctree::
+ :maxdepth: 2
+
+ basic_use
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/docs/make.bat
new/jsondiff-1.3.0/docs/make.bat
--- old/jsondiff-1.2.0/docs/make.bat 1970-01-01 01:00:00.000000000 +0100
+++ new/jsondiff-1.3.0/docs/make.bat 2021-04-19 21:51:14.000000000 +0200
@@ -0,0 +1,263 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+ set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=_build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
+set I18NSPHINXOPTS=%SPHINXOPTS% .
+if NOT "%PAPER%" == "" (
+ set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+ set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+ :help
+ echo.Please use `make ^<target^>` where ^<target^> is one of
+ echo. html to make standalone HTML files
+ echo. dirhtml to make HTML files named index.html in directories
+ echo. singlehtml to make a single large HTML file
+ echo. pickle to make pickle files
+ echo. json to make JSON files
+ echo. htmlhelp to make HTML files and a HTML help project
+ echo. qthelp to make HTML files and a qthelp project
+ echo. devhelp to make HTML files and a Devhelp project
+ echo. epub to make an epub
+ echo. latex to make LaTeX files, you can set PAPER=a4 or
PAPER=letter
+ echo. text to make text files
+ echo. man to make manual pages
+ echo. texinfo to make Texinfo files
+ echo. gettext to make PO message catalogs
+ echo. changes to make an overview over all changed/added/deprecated
items
+ echo. xml to make Docutils-native XML files
+ echo. pseudoxml to make pseudoxml-XML files for display purposes
+ echo. linkcheck to check all external links for integrity
+ echo. doctest to run all doctests embedded in the documentation if
enabled
+ echo. coverage to run coverage check of the documentation if enabled
+ goto end
+)
+
+if "%1" == "clean" (
+ for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+ del /q /s %BUILDDIR%\*
+ goto end
+)
+
+
+REM Check if sphinx-build is available and fallback to Python version if any
+%SPHINXBUILD% 2> nul
+if errorlevel 9009 goto sphinx_python
+goto sphinx_ok
+
+:sphinx_python
+
+set SPHINXBUILD=python -m sphinx.__init__
+%SPHINXBUILD% 2> nul
+if errorlevel 9009 (
+ echo.
+ echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+ echo.installed, then set the SPHINXBUILD environment variable to point
+ echo.to the full path of the 'sphinx-build' executable. Alternatively
you
+ echo.may add the Sphinx directory to PATH.
+ echo.
+ echo.If you don't have Sphinx installed, grab it from
+ echo.http://sphinx-doc.org/
+ exit /b 1
+)
+
+:sphinx_ok
+
+
+if "%1" == "html" (
+ %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+ goto end
+)
+
+if "%1" == "dirhtml" (
+ %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+ goto end
+)
+
+if "%1" == "singlehtml" (
+ %SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+ goto end
+)
+
+if "%1" == "pickle" (
+ %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished; now you can process the pickle files.
+ goto end
+)
+
+if "%1" == "json" (
+ %SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished; now you can process the JSON files.
+ goto end
+)
+
+if "%1" == "htmlhelp" (
+ %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+ goto end
+)
+
+if "%1" == "qthelp" (
+ %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+ echo.^> qcollectiongenerator %BUILDDIR%\qthelp\jsondiff.qhcp
+ echo.To view the help file:
+ echo.^> assistant -collectionFile %BUILDDIR%\qthelp\jsondiff.ghc
+ goto end
+)
+
+if "%1" == "devhelp" (
+ %SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished.
+ goto end
+)
+
+if "%1" == "epub" (
+ %SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The epub file is in %BUILDDIR%/epub.
+ goto end
+)
+
+if "%1" == "latex" (
+ %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+ goto end
+)
+
+if "%1" == "latexpdf" (
+ %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+ cd %BUILDDIR%/latex
+ make all-pdf
+ cd %~dp0
+ echo.
+ echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+ goto end
+)
+
+if "%1" == "latexpdfja" (
+ %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+ cd %BUILDDIR%/latex
+ make all-pdf-ja
+ cd %~dp0
+ echo.
+ echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+ goto end
+)
+
+if "%1" == "text" (
+ %SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The text files are in %BUILDDIR%/text.
+ goto end
+)
+
+if "%1" == "man" (
+ %SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The manual pages are in %BUILDDIR%/man.
+ goto end
+)
+
+if "%1" == "texinfo" (
+ %SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
+ goto end
+)
+
+if "%1" == "gettext" (
+ %SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
+ goto end
+)
+
+if "%1" == "changes" (
+ %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.The overview file is in %BUILDDIR%/changes.
+ goto end
+)
+
+if "%1" == "linkcheck" (
+ %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+ goto end
+)
+
+if "%1" == "doctest" (
+ %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+ goto end
+)
+
+if "%1" == "coverage" (
+ %SPHINXBUILD% -b coverage %ALLSPHINXOPTS% %BUILDDIR%/coverage
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Testing of coverage in the sources finished, look at the ^
+results in %BUILDDIR%/coverage/python.txt.
+ goto end
+)
+
+if "%1" == "xml" (
+ %SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The XML files are in %BUILDDIR%/xml.
+ goto end
+)
+
+if "%1" == "pseudoxml" (
+ %SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
+ goto end
+)
+
+:end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/jsondiff/__init__.py
new/jsondiff-1.3.0/jsondiff/__init__.py
--- old/jsondiff-1.2.0/jsondiff/__init__.py 2019-06-23 17:09:31.000000000
+0200
+++ new/jsondiff-1.3.0/jsondiff/__init__.py 2021-04-19 21:51:14.000000000
+0200
@@ -1,4 +1,4 @@
-__version__ = '1.2.0'
+__version__ = '1.3.0'
import sys
import json
@@ -367,24 +367,25 @@
for symbol in _all_symbols_
}
- def _list_diff_0(self, C, X, Y, i, j):
- if i > 0 and j > 0:
- d, s = self._obj_diff(X[i-1], Y[j-1])
- if s > 0 and C[i][j] == C[i-1][j-1] + s:
- for annotation in self._list_diff_0(C, X, Y, i-1, j-1):
- yield annotation
- yield (0, d, j-1, s)
- return
- if j > 0 and (i == 0 or C[i][j-1] >= C[i-1][j]):
- for annotation in self._list_diff_0(C, X, Y, i, j-1):
- yield annotation
- yield (1, Y[j-1], j-1, 0.0)
- return
- if i > 0 and (j == 0 or C[i][j-1] < C[i-1][j]):
- for annotation in self._list_diff_0(C, X, Y, i-1, j):
- yield annotation
- yield (-1, X[i-1], i-1, 0.0)
- return
+ def _list_diff_0(self, C, X, Y):
+ i, j = len(X), len(Y)
+ r = []
+ while True:
+ if i > 0 and j > 0:
+ d, s = self._obj_diff(X[i-1], Y[j-1])
+ if s > 0 and C[i][j] == C[i-1][j-1] + s:
+ r.append((0, d, j-1, s))
+ i, j = i - 1, j - 1
+ continue
+ if j > 0 and (i == 0 or C[i][j-1] >= C[i-1][j]):
+ r.append((1, Y[j-1], j-1, 0.0))
+ j = j - 1
+ continue
+ if i > 0 and (j == 0 or C[i][j-1] < C[i-1][j]):
+ r.append((-1, X[i-1], i-1, 0.0))
+ i = i - 1
+ continue
+ return reversed(r)
def _list_diff(self, X, Y):
# LCS
@@ -405,7 +406,8 @@
deleted = []
changed = {}
tot_s = 0.0
- for sign, value, pos, s in self._list_diff_0(C, X, Y, len(X), len(Y)):
+
+ for sign, value, pos, s in self._list_diff_0(C, X, Y):
if sign == 1:
inserted.append((pos, value))
elif sign == -1:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/jsondiff.egg-info/PKG-INFO
new/jsondiff-1.3.0/jsondiff.egg-info/PKG-INFO
--- old/jsondiff-1.2.0/jsondiff.egg-info/PKG-INFO 2019-06-23
17:14:39.000000000 +0200
+++ new/jsondiff-1.3.0/jsondiff.egg-info/PKG-INFO 1970-01-01
01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-Metadata-Version: 1.1
-Name: jsondiff
-Version: 1.2.0
-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: UNKNOWN
-Keywords: json,diff,diffing,difference,patch,delta,dict,LCS
-Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/jsondiff.egg-info/SOURCES.txt
new/jsondiff-1.3.0/jsondiff.egg-info/SOURCES.txt
--- old/jsondiff-1.2.0/jsondiff.egg-info/SOURCES.txt 2019-06-23
17:14:39.000000000 +0200
+++ new/jsondiff-1.3.0/jsondiff.egg-info/SOURCES.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-LICENSE
-MANIFEST.in
-README.rst
-setup.py
-jsondiff/__init__.py
-jsondiff/cli.py
-jsondiff/symbols.py
-jsondiff.egg-info/PKG-INFO
-jsondiff.egg-info/SOURCES.txt
-jsondiff.egg-info/dependency_links.txt
-jsondiff.egg-info/entry_points.txt
-jsondiff.egg-info/top_level.txt
-tests/__init__.py
-tests/generate_readme.py
-tests/utils.py
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jsondiff-1.2.0/jsondiff.egg-info/dependency_links.txt
new/jsondiff-1.3.0/jsondiff.egg-info/dependency_links.txt
--- old/jsondiff-1.2.0/jsondiff.egg-info/dependency_links.txt 2019-06-23
17:14:39.000000000 +0200
+++ new/jsondiff-1.3.0/jsondiff.egg-info/dependency_links.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/jsondiff.egg-info/entry_points.txt
new/jsondiff-1.3.0/jsondiff.egg-info/entry_points.txt
--- old/jsondiff-1.2.0/jsondiff.egg-info/entry_points.txt 2019-06-23
17:14:39.000000000 +0200
+++ new/jsondiff-1.3.0/jsondiff.egg-info/entry_points.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-[console_scripts]
-jdiff = jsondiff.cli:main
-jsondiff = jsondiff.cli:main_deprecated
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/jsondiff.egg-info/top_level.txt
new/jsondiff-1.3.0/jsondiff.egg-info/top_level.txt
--- old/jsondiff-1.2.0/jsondiff.egg-info/top_level.txt 2019-06-23
17:14:39.000000000 +0200
+++ new/jsondiff-1.3.0/jsondiff.egg-info/top_level.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-jsondiff
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/setup.cfg new/jsondiff-1.3.0/setup.cfg
--- old/jsondiff-1.2.0/setup.cfg 2019-06-23 17:14:39.000000000 +0200
+++ new/jsondiff-1.3.0/setup.cfg 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-[egg_info]
-tag_build =
-tag_date = 0
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/setup.py new/jsondiff-1.3.0/setup.py
--- old/jsondiff-1.2.0/setup.py 2019-06-23 17:09:06.000000000 +0200
+++ new/jsondiff-1.3.0/setup.py 2021-04-19 21:51:14.000000000 +0200
@@ -15,6 +15,7 @@
url='https://github.com/ZoomerAnalytics/jsondiff',
keywords=['json', 'diff', 'diffing', 'difference', 'patch', 'delta',
'dict', 'LCS'],
classifiers=[
+ 'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsondiff-1.2.0/tests/__init__.py
new/jsondiff-1.3.0/tests/__init__.py
--- old/jsondiff-1.2.0/tests/__init__.py 2016-10-19 11:29:58.000000000
+0200
+++ new/jsondiff-1.3.0/tests/__init__.py 2021-04-19 21:51:14.000000000
+0200
@@ -1,3 +1,4 @@
+import sys
import unittest
from jsondiff import diff, replace, add, discard, insert, delete, update,
JsonDiffer
@@ -113,3 +114,17 @@
self.assertEqual(a, differ.unpatch(b, d))
dm = differ.marshal(d)
self.assertEqual(d, differ.unmarshal(dm))
+
+ def test_long_arrays(self):
+ size = 100
+ a = [{'a': i, 'b': 2 * i} for i in range(1, size)]
+ b = [{'a': i, 'b': 3 * i} for i in range(1, size)]
+ r = sys.getrecursionlimit()
+ sys.setrecursionlimit(size - 1)
+
+ try:
+ diff(a, b)
+ except RecursionError:
+ self.fail('cannot diff long arrays')
+ finally:
+ sys.setrecursionlimit(r)
++++++ remove_nose.patch ++++++
--- /var/tmp/diff_new_pack.5QaxH1/_old 2021-12-08 00:00:38.447556993 +0100
+++ /var/tmp/diff_new_pack.5QaxH1/_new 2021-12-08 00:00:38.447556993 +0100
@@ -1,44 +1,10 @@
---- /dev/null
-+++ b/tests/_random.py
-@@ -0,0 +1,33 @@
-+import sys
-+from random import Random
-+
-+PY3 = (sys.version_info[0] == 3)
-+
-+
-+def _generate_tag(n, rng):
-+ return ''.join(rng.choice('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789')
-+ for _ in range(n))
-+
-+
-+def randomize(n, scenario_generator, seed=12038728732):
-+ def decorator(test):
-+ def randomized_test(self):
-+ rng_seed = Random(seed)
-+ nseeds = n
-+ # (rng_seed.getrandbits(32) for i in range(n))
-+ seeds = (_generate_tag(12, rng_seed) for i in range(n))
-+ for i, rseed in enumerate(seeds):
-+ rng = Random(rseed)
-+ scenario = scenario_generator(self, rng)
-+ try:
-+ test(self, scenario)
-+ except Exception as e:
-+ import sys
-+ if PY3:
-+ raise type(e).with_traceback(type(e)('%s with
scenario %s (%i of %i)' %
-+ (e.message,
rseed, i+1, nseeds)), sys.exc_info()[2])
-+ else:
-+ raise (type(e), type(e)('%s with scenario %s (%i of
%i)'
-+ % (e.message, rseed, i+1, nseeds)),
sys.exc_info()[2])
-+ return randomized_test
-+ return decorator
---- a/tests/__init__.py
-+++ b/tests/__init__.py
-@@ -1,115 +0,0 @@
+diff -Nru jsondiff-1.3.0.orig/tests/__init__.py
jsondiff-1.3.0/tests/__init__.py
+--- jsondiff-1.3.0.orig/tests/__init__.py 2021-04-19 21:51:14.000000000
+0200
++++ jsondiff-1.3.0/tests/__init__.py 2021-12-07 10:25:30.252455974 +0100
+@@ -1,130 +1,15 @@
+ import sys
-import unittest
--
+
-from jsondiff import diff, replace, add, discard, insert, delete, update,
JsonDiffer
-
-from .utils import generate_random_json, perturbate_json
@@ -152,8 +118,73 @@
- self.assertEqual(a, differ.unpatch(b, d))
- dm = differ.marshal(d)
- self.assertEqual(d, differ.unmarshal(dm))
---- /dev/null
-+++ b/tests/test_jsondiff.py
+-
+- def test_long_arrays(self):
+- size = 100
+- a = [{'a': i, 'b': 2 * i} for i in range(1, size)]
+- b = [{'a': i, 'b': 3 * i} for i in range(1, size)]
+- r = sys.getrecursionlimit()
+- sys.setrecursionlimit(size - 1)
+-
+- try:
+- diff(a, b)
+- except RecursionError:
+- self.fail('cannot diff long arrays')
+- finally:
+- sys.setrecursionlimit(r)
++def test_long_arrays(self):
++ size = 100
++ a = [{'a': i, 'b': 2 * i} for i in range(1, size)]
++ b = [{'a': i, 'b': 3 * i} for i in range(1, size)]
++ r = sys.getrecursionlimit()
++ sys.setrecursionlimit(size - 1)
++
++ try:
++ diff(a, b)
++ except RecursionError:
++ self.fail('cannot diff long arrays')
++ finally:
++ sys.setrecursionlimit(r)
+diff -Nru jsondiff-1.3.0.orig/tests/_random.py jsondiff-1.3.0/tests/_random.py
+--- jsondiff-1.3.0.orig/tests/_random.py 1970-01-01 01:00:00.000000000
+0100
++++ jsondiff-1.3.0/tests/_random.py 2021-12-07 10:21:59.457195559 +0100
+@@ -0,0 +1,33 @@
++import sys
++from random import Random
++
++PY3 = (sys.version_info[0] == 3)
++
++
++def _generate_tag(n, rng):
++ return ''.join(rng.choice('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789')
++ for _ in range(n))
++
++
++def randomize(n, scenario_generator, seed=12038728732):
++ def decorator(test):
++ def randomized_test(self):
++ rng_seed = Random(seed)
++ nseeds = n
++ # (rng_seed.getrandbits(32) for i in range(n))
++ seeds = (_generate_tag(12, rng_seed) for i in range(n))
++ for i, rseed in enumerate(seeds):
++ rng = Random(rseed)
++ scenario = scenario_generator(self, rng)
++ try:
++ test(self, scenario)
++ except Exception as e:
++ import sys
++ if PY3:
++ raise type(e).with_traceback(type(e)('%s with
scenario %s (%i of %i)' %
++ (e.message,
rseed, i+1, nseeds)), sys.exc_info()[2])
++ else:
++ raise (type(e), type(e)('%s with scenario %s (%i of
%i)'
++ % (e.message, rseed, i+1, nseeds)),
sys.exc_info()[2])
++ return randomized_test
++ return decorator
+diff -Nru jsondiff-1.3.0.orig/tests/test_jsondiff.py
jsondiff-1.3.0/tests/test_jsondiff.py
+--- jsondiff-1.3.0.orig/tests/test_jsondiff.py 1970-01-01 01:00:00.000000000
+0100
++++ jsondiff-1.3.0/tests/test_jsondiff.py 2021-12-07 10:21:59.457195559
+0100
@@ -0,0 +1,112 @@
+import unittest
+
