Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pull] master from stefankoegl:master #1

Open
wants to merge 167 commits into
base: master
Choose a base branch
from
Open

[pull] master from stefankoegl:master #1

wants to merge 167 commits into from

Commits on Oct 18, 2015

  1. Fix build failure on Travis CI with Python 3.2 

    See https://bitbucket.org/ned/coveragepy/issues/407
    @selurvedu
    selurvedu committed Oct 18, 2015
    Configuration menu
    Copy the full SHA
    70306fa View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2015

  1. Merge pull request #45 from selurvedu/py32_coverage 

    Fix build failure on Travis CI with Python 3.2
    @stefankoegl
    stefankoegl committed Oct 22, 2015
    Configuration menu
    Copy the full SHA
    a2ba02f View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2015

  1. Allow running certain tests separately 

    E.g. `python2 -m unittest tests.MakePatchTestCase.test_objects`
or `nose tests:MakePatchTestCase.test_objects`.
    @selurvedu
    selurvedu committed Oct 24, 2015
    Configuration menu
    Copy the full SHA
    0ae80ba View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2015

  1. Merge pull request #43 from selurvedu/separate-tests 

    Allow running certain tests separately
    @stefankoegl
    stefankoegl committed Oct 28, 2015
    Configuration menu
    Copy the full SHA
    99bf616 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2015

  1. Fix bug in _split_by_common_seq using wrong range in right subtree

    Alex Pinkney committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    3f2328e View commit details
    Browse the repository at this point in the history

  2. Add failing test for #40

    @stefankoegl
    stefankoegl committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    2a02d21 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #46 from apinkney97/master, fixes #40 

    Fix bug in _split_by_common_seq using wrong range in right subtree
    @stefankoegl
    stefankoegl committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    46ad04c View commit details
    Browse the repository at this point in the history

  4. bump version to 1.12

    @stefankoegl
    stefankoegl committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    d877f1d View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2016

  1. Add encoding info to setup.py

    @stefankoegl
    stefankoegl committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    5c2a9b9 View commit details
    Browse the repository at this point in the history

  2. Create "universal" wheel packages

    @stefankoegl
    stefankoegl committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    32dcbb0 View commit details
    Browse the repository at this point in the history

  3. Optimize "deep" replace operation, fixes #36

    @stefankoegl
    stefankoegl committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    a33021b View commit details
    Browse the repository at this point in the history

  4. Make move operation with from == path a no-op

    @stefankoegl
    stefankoegl committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    4443d32 View commit details
    Browse the repository at this point in the history

  5. Print test comments when external tests fail 

    Makes it easier to locate the failing tests in the test file
    @stefankoegl
    stefankoegl committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    cf0da04 View commit details
    Browse the repository at this point in the history

  6. Remove import of pudb

    @stefankoegl
    stefankoegl committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    9ce8487 View commit details
    Browse the repository at this point in the history

  7. bump version to 1.13

    @stefankoegl
    stefankoegl committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    b15d8f1 View commit details
    Browse the repository at this point in the history

  8. Update trove classification to include Python 3.5

    @stefankoegl
    stefankoegl committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    5cc9bee View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2016

  1. Extend tests that check list patching

    @selurvedu
    selurvedu committed Apr 8, 2016
    Configuration menu
    Copy the full SHA
    282beba View commit details
    Browse the repository at this point in the history

  2. Allow longer patches in test_use_move_...

    @selurvedu
    selurvedu committed Apr 8, 2016
    Configuration menu
    Copy the full SHA
    c106735 View commit details
    Browse the repository at this point in the history

  3. added error-prone cases to default tests

    @tyerq @selurvedu
    tyerq authored and selurvedu committed Apr 8, 2016
    Configuration menu
    Copy the full SHA
    6761340 View commit details
    Browse the repository at this point in the history

  4. Update tests from ea80865 to run on Python 3.2

    @selurvedu
    selurvedu committed Apr 8, 2016
    Configuration menu
    Copy the full SHA
    0734d45 View commit details
    Browse the repository at this point in the history

  5. Move list-related testcases into separate class

    @selurvedu
    selurvedu committed Apr 8, 2016
    Configuration menu
    Copy the full SHA
    73acf7f View commit details
    Browse the repository at this point in the history

  6. Merge branch '[email protected]' into [email protected] 

    Conflicts:
	tests.py
    @selurvedu
    selurvedu committed Apr 8, 2016
    Configuration menu
    Copy the full SHA
    a2cd6da View commit details
    Browse the repository at this point in the history

Commits on May 4, 2016

  1. Fix KeyError in add/remove optimization

    @go1dshtein
    go1dshtein committed May 4, 2016
    Configuration menu
    Copy the full SHA
    72a90e3 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2016

  1. Merge pull request #50 from go1dshtein/master 

    Fix KeyError in add/remove optimization
    @stefankoegl
    stefankoegl committed May 31, 2016
    Configuration menu
    Copy the full SHA
    c9ac1d9 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2016

  1. Use inspect.signature() on Python 3 

    The inspect.getargspec() function has been deprecated in Python 3:
https://docs.python.org/3/library/inspect.html#inspect.getargspec
    @vstinner
    vstinner committed Jul 22, 2016
    Configuration menu
    Copy the full SHA
    d6e9a00 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #52 from haypo/signature 

    Use inspect.signature() on Python 3
    @stefankoegl
    stefankoegl authored Jul 22, 2016
    Configuration menu
    Copy the full SHA
    55e0c43 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2016

  1. If there is no diff print nothing; exit 1 if a diff is found (#53) 

    if there is no diff print nothing, and exit 1 if a diff is found
    @gergnz @stefankoegl
    gergnz authored and stefankoegl committed Oct 2, 2016
    Configuration menu
    Copy the full SHA
    4e95310 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2017

  1. Run tests with Python 3.6

    @stefankoegl
    Rémy HUBSCHER authored and stefankoegl committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    1dbc03c View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2017

  1. Update trove classification to include Python 3.6

    @stefankoegl
    stefankoegl committed Jan 12, 2017
    Configuration menu
    Copy the full SHA
    a01bec7 View commit details
    Browse the repository at this point in the history

  2. bump version to 1.14

    @stefankoegl
    stefankoegl committed Jan 12, 2017
    Configuration menu
    Copy the full SHA
    8b46602 View commit details
    Browse the repository at this point in the history

  3. bump version to 1.15

    @stefankoegl
    stefankoegl committed Jan 12, 2017
    Configuration menu
    Copy the full SHA
    27f1f98 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2017

  1. Fix: optimization bugs #55, #54, add more tests

    @mrhadenough
    mrhadenough committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    d1f317a View commit details
    Browse the repository at this point in the history

  2. Fix: python 3.2 tests

    @mrhadenough
    mrhadenough committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    05d9ace View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2017

  1. don't apply patch optimization when it's incorrect

    @mrhadenough
    mrhadenough committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    e18a131 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2017

  1. Merge branch 'mrhadenough-fix_optimization_bugs'

    @stefankoegl
    stefankoegl committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    18887df View commit details
    Browse the repository at this point in the history

  2. Bump version to 1.16

    @stefankoegl
    stefankoegl committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    1fc5e20 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2017

  1. Avoid double work (#62) 

    In the case where the optimized patch is not invalid, we shouldn't need to calculate the patch again.
    @mithrandi @stefankoegl
    mithrandi authored and stefankoegl committed Jul 9, 2017
    Configuration menu
    Copy the full SHA
    e8fbd18 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2017

  1. Merge commit '1fc5e2022ff2c5796bd28af56646b135ede4ee71'

    @stefankoegl
    stefankoegl committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    4d9adf1 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2017

  1. fixing array diff bug (issue #30)

    @velislavgerov
    velislavgerov committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    b878d85 View commit details
    Browse the repository at this point in the history

  2. added a test case for issue #30

    @velislavgerov
    velislavgerov committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    845cf4a View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2017

  1. Merge branch '[email protected]' into list_tests 

    https://github.com/selurvedu/python-json-patch
    @stefankoegl
    stefankoegl committed Sep 3, 2017
    Configuration menu
    Copy the full SHA
    717b0db View commit details
    Browse the repository at this point in the history

  2. Disable tests for disabled optimizations

    @stefankoegl
    stefankoegl committed Sep 3, 2017
    Configuration menu
    Copy the full SHA
    fbc904f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'list_tests'

    @stefankoegl
    stefankoegl committed Sep 3, 2017
    Configuration menu
    Copy the full SHA
    f0a4f51 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2017

  1. Merge pull request #65 from thunderstruck47/master 

    fixing array diff bug (issue #30)
    @stefankoegl
    stefankoegl authored Sep 10, 2017
    Configuration menu
    Copy the full SHA
    7583258 View commit details
    Browse the repository at this point in the history

  2. Remove trailing whitespace

    @stefankoegl
    stefankoegl committed Sep 10, 2017
    Configuration menu
    Copy the full SHA
    e649871 View commit details
    Browse the repository at this point in the history

  3. Remove support for Python 3.2

    @stefankoegl
    stefankoegl committed Sep 10, 2017
    Configuration menu
    Copy the full SHA
    d778745 View commit details
    Browse the repository at this point in the history

  4. Drop in patch creation from jsondiff 

    https://github.com/nxsofsys/jsondiff
    @stefankoegl
    stefankoegl committed Sep 10, 2017
    Configuration menu
    Copy the full SHA
    1964607 View commit details
    Browse the repository at this point in the history

  5. Remove re-creation of no-optimization patch

    @stefankoegl
    stefankoegl committed Sep 10, 2017
    Configuration menu
    Copy the full SHA
    82ac779 View commit details
    Browse the repository at this point in the history

  6. Re-enable previously disabled optimization tests

    @stefankoegl
    stefankoegl committed Sep 10, 2017
    Configuration menu
    Copy the full SHA
    2f45e50 View commit details
    Browse the repository at this point in the history

  7. Merge _op_base classes into PatchOperation classes

    @stefankoegl
    stefankoegl committed Sep 10, 2017
    Configuration menu
    Copy the full SHA
    03aa14e View commit details
    Browse the repository at this point in the history

  8. Break long lines

    @stefankoegl
    stefankoegl committed Sep 10, 2017
    Configuration menu
    Copy the full SHA
    73daf9b View commit details
    Browse the repository at this point in the history

  9. Redefine _compare_info class as DiffBuilder

    @stefankoegl
    stefankoegl committed Sep 10, 2017
    Configuration menu
    Copy the full SHA
    098c7c7 View commit details
    Browse the repository at this point in the history

  10. Simplify compatibility code

    @stefankoegl
    stefankoegl committed Sep 10, 2017
    Configuration menu
    Copy the full SHA
    7387d20 View commit details
    Browse the repository at this point in the history

  11. Rename old{path,key} to from_{path,key}

    @stefankoegl
    stefankoegl committed Sep 10, 2017
    Configuration menu
    Copy the full SHA
    2d9a565 View commit details
    Browse the repository at this point in the history

  12. Code style

    @stefankoegl
    stefankoegl committed Sep 10, 2017
    Configuration menu
    Copy the full SHA
    462c9cb View commit details
    Browse the repository at this point in the history

  13. Improve optimizations

    @stefankoegl
    stefankoegl committed Sep 10, 2017
    Configuration menu
    Copy the full SHA
    3cec8a0 View commit details
    Browse the repository at this point in the history

  14. Fix unicode dict keys in Python 2

    @stefankoegl
    stefankoegl committed Sep 10, 2017
    Configuration menu
    Copy the full SHA
    d602f5e View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2017

  1. Remove support for Python 3.2

    @stefankoegl
    stefankoegl committed Oct 21, 2017
    Configuration menu
    Copy the full SHA
    4351804 View commit details
    Browse the repository at this point in the history

  2. Remove support for Python 2.6

    @stefankoegl
    stefankoegl committed Oct 21, 2017
    Configuration menu
    Copy the full SHA
    7079bdc View commit details
    Browse the repository at this point in the history

  3. Update supported versions in docs

    @stefankoegl
    stefankoegl committed Oct 21, 2017
    Configuration menu
    Copy the full SHA
    b6514dd View commit details
    Browse the repository at this point in the history

  4. Avoid overriding json.load (fixes #37)

    @stefankoegl
    stefankoegl committed Oct 21, 2017
    Configuration menu
    Copy the full SHA
    074f937 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2017

  1. Show coverage report after tests

    @stefankoegl
    stefankoegl committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    6b777b7 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2017

  1. Merge branch 'master' into jsondiff

    @stefankoegl
    stefankoegl committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    7b4fb66 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'jsonload-no-override'

    @stefankoegl
    stefankoegl committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    7465c1b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'jsondiff'

    @stefankoegl
    stefankoegl committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    66c2e50 View commit details
    Browse the repository at this point in the history

  4. Reformat .travis.yml

    @stefankoegl
    stefankoegl committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    ae15a3b View commit details
    Browse the repository at this point in the history

  5. Deploy to PyPI from Travis-CI

    @stefankoegl
    stefankoegl committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    5ea6224 View commit details
    Browse the repository at this point in the history

  6. Disable tests for Python 2.6 

    This was disabled before, and was erroneously re-enabled in
ae15a3b
    @stefankoegl
    stefankoegl committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    e066c28 View commit details
    Browse the repository at this point in the history

  7. Bump version to 1.20 

    The next version would have been 1.17, but a bump to 1.20 was requested
per #67 to fix an issue with versioning of the Debian package

#67
    @stefankoegl
    stefankoegl committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    d8c54d6 View commit details
    Browse the repository at this point in the history

  8. Add test case for issue reported in #74

    @stefankoegl
    stefankoegl committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    04596b8 View commit details
    Browse the repository at this point in the history

  9. Add test case for issue reported in #41

    @stefankoegl
    stefankoegl committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    ae895f7 View commit details
    Browse the repository at this point in the history

  10. Update ext_tests.py for current versions of coverage

    @stefankoegl
    stefankoegl committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    62db640 View commit details
    Browse the repository at this point in the history

  11. Remove broken badges from README

    @stefankoegl
    stefankoegl authored Nov 25, 2017
    Configuration menu
    Copy the full SHA
    df0c56d View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2017

  1. Expect path/from attributes also as JsonPoiner instances (#60)

    @stefankoegl
    stefankoegl committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    aae6082 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2017

  1. Remove extraneous 'value' field for op:remove (#76) 

    RFC 6902 section 4.2 [0] does not define a 'value' field for
the 'remove' operation.  The commit "Merge _op_base classes
into PatchOperation classes" [1] introduced a 'value' field
in _item_removed() in the DiffBuilder class.  This patch
removes the 'value' field from the 'remove' operation, adds
a new test, and revises some other tests.

[0] https://tools.ietf.org/html/rfc6902#section-4.2
[1] 03aa14e
    @ostackbrian
    ostackbrian committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    e500b4d View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2017

  1. Merge pull request #77 from ostackbrian/issue-76 

    Remove extraneous 'value' field for op:remove (#76)
    @stefankoegl
    stefankoegl authored Dec 30, 2017
    Configuration menu
    Copy the full SHA
    cfd69e5 View commit details
    Browse the repository at this point in the history

  2. Bump version to 1.21

    @stefankoegl
    stefankoegl committed Dec 30, 2017
    Configuration menu
    Copy the full SHA
    4ff7398 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2018

  1. Drop support for EOL Python 3.3

    @hugovk
    hugovk committed Jan 16, 2018
    Configuration menu
    Copy the full SHA
    71bdeed View commit details
    Browse the repository at this point in the history

  2. Remove ununsed imports and variables

    @hugovk
    hugovk committed Jan 16, 2018
    Configuration menu
    Copy the full SHA
    d5a7aed View commit details
    Browse the repository at this point in the history

  3. Update badges and fix typos

    @hugovk
    hugovk committed Jan 16, 2018
    Configuration menu
    Copy the full SHA
    02fa1f8 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #81 from hugovk/rm-3.3 

    Drop support for EOL Python 3.3
    @stefankoegl
    stefankoegl authored Jan 16, 2018
    Configuration menu
    Copy the full SHA
    0642254 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2018

  1. Add tests.js to MANIFEST.in, fixes #82

    @stefankoegl
    stefankoegl committed Mar 11, 2018
    Configuration menu
    Copy the full SHA
    7b664c4 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2018

  1. Bump version to 1.22

    @stefankoegl
    stefankoegl committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    7e55ad6 View commit details
    Browse the repository at this point in the history

  2. Add project URLs to setup.py

    @stefankoegl
    stefankoegl committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    3c621da View commit details
    Browse the repository at this point in the history

  3. Merge pull request #75 from stefankoegl/jsonptr 

    Expect path/from attributes also as JsonPoiner instances (#60)
    @stefankoegl
    stefankoegl authored Apr 2, 2018
    Configuration menu
    Copy the full SHA
    0c96a53 View commit details
    Browse the repository at this point in the history

  4. Bump version to 1.23

    @stefankoegl
    stefankoegl committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    36b245a View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2018

  1. better exception when unable to fully resolve a jsonpointer on add or… 

    … replace operations

When a "path" jsonpointer in a add or replace operation points to a non-resolvable inner element, raise a JsonPatchConflict with a clear error message rather than a TypeError with an obscure message
    @guillp
    guillp authored Jul 17, 2018
    Configuration menu
    Copy the full SHA
    4c6f547 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2018

  1. Merge pull request #89 from guillp/patch-1 

    better exception when a 'path' points to a non existing location
    @stefankoegl
    stefankoegl authored Aug 1, 2018
    Configuration menu
    Copy the full SHA
    2990bb3 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2019

  1. Ensure an item is within the upper array boundaries before replacing it

    Guillaume Desvé committed May 16, 2019
    Configuration menu
    Copy the full SHA
    0410363 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2019

  1. Fix move for numeric dictionary keys (issue #97)

    Igor Tkach committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    1b83d63 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2019

  1. Merge tag 'v1.23' 

    release v1.23
    Igor Tkach committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    b5141ab View commit details
    Browse the repository at this point in the history

  2. bump version

    Igor Tkach committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    53817c0 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2019

  1. Merge pull request #99 from itkach/master 

    Fix move for numeric dictionary keys (issue #97)
    @stefankoegl
    stefankoegl authored Jul 28, 2019
    Configuration menu
    Copy the full SHA
    33e630e View commit details
    Browse the repository at this point in the history

  2. Support Python 3.7, test with Python 3.8 dev

    @stefankoegl
    stefankoegl committed Jul 28, 2019
    Configuration menu
    Copy the full SHA
    abf27f2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #100 from stefankoegl/python-3.8 

    Support Python 3.7, test with Python 3.8 dev
    @stefankoegl
    stefankoegl authored Jul 28, 2019
    Configuration menu
    Copy the full SHA
    911b79f View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2019

  1. Travis CI: Add Python 3.8 production release

    @cclauss
    cclauss authored Nov 9, 2019
    Configuration menu
    Copy the full SHA
    2f2790b View commit details
    Browse the repository at this point in the history

  2. fixup! setup.py: Add Python 3.8 and remove 3.4

    @cclauss
    cclauss authored Nov 9, 2019
    Configuration menu
    Copy the full SHA
    9ca2e21 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2019

  1. Merge pull request #104 from cclauss/patch-1 

    Travis CI: Add Python 3.8 production release
    @stefankoegl
    stefankoegl authored Nov 13, 2019
    Configuration menu
    Copy the full SHA
    3e44e04 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2020

  1. Test to reproduce: 

    #90
#103
    Jonathan Hilliard committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    ed43114 View commit details
    Browse the repository at this point in the history

  2. Flagging type-only changes with DiffBuilder

    Jonathan Hilliard committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    028089d View commit details
    Browse the repository at this point in the history

  3. Changing previous type comparison to just comparing how json.dumps re… 

    …nders 2 values.

This avoids flagging mismatches between classes which happen to be different but which are JSONified as the same thing.
    Jonathan Hilliard committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    97e18f3 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #96 from gdraynz/replace-array-indexerror 

    Ensure an item is within the upper array boundaries before replacing it
    @stefankoegl
    stefankoegl authored Jan 28, 2020
    Configuration menu
    Copy the full SHA
    b3726f3 View commit details
    Browse the repository at this point in the history

  5. Added comment.

    Jonathan Hilliard committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    c1fce71 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2020

  1. Merge pull request #106 from blakehilliard/only-type-diff 

    Fix issue not recognizing that, in JSON, 1 != 1.0 != True
    @stefankoegl
    stefankoegl authored Jan 29, 2020
    Configuration menu
    Copy the full SHA
    91f6124 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2020

  1. Make it possible for from_diff to support custom types (issue #107)

    @clj
    clj committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    e99d178 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2020

  1. Fixed some typos and wording

    @vavanade
    vavanade authored Feb 27, 2020
    Configuration menu
    Copy the full SHA
    8fbed9b View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2020

  1. Merge pull request #109 from vavanade/patch-1 

    Fixed some typos and wording
    @stefankoegl
    stefankoegl authored Mar 2, 2020
    Configuration menu
    Copy the full SHA
    9e4d423 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2020

  1. Subclassing can override json dumper and loader 

    Additionally:

* from_string gets a loads parameter
* to_string gets a dumps_parameter
* documentation added
* added more tests
    @clj
    clj committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    0167d34 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into custom-types

    @clj
    clj committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    1457aaf View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2020

  1. Make DiffBuilder's dumps argument optional

    @clj
    clj committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    29c989e View commit details
    Browse the repository at this point in the history

Commits on May 23, 2020

  1. fix #111: optimizing exception message

    @Alanscut
    Alanscut committed May 23, 2020
    Configuration menu
    Copy the full SHA
    1015d7f View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2020

  1. fix #102: optimize error handling

    @Alanscut
    Alanscut committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    86f82be View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2020

  1. Merge pull request #113 from Alanscut/issue-102 

    fix #102: optimize error handling
    @stefankoegl
    stefankoegl authored Jun 22, 2020
    Configuration menu
    Copy the full SHA
    625555e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #112 from Alanscut/issue-111 

    fix #111:  optimizing exception message
    @stefankoegl
    stefankoegl authored Jun 22, 2020
    Configuration menu
    Copy the full SHA
    4fe5c2c View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2020

  1. feat: add custom json pointer support

    Artyom Nikitin committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    ab775d1 View commit details
    Browse the repository at this point in the history

  2. test: custo json pointer

    Artyom Nikitin committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    bb4ea7b View commit details
    Browse the repository at this point in the history

  3. doc: fix docstrings

    Artyom Nikitin committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    124eb76 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2020

  1. test: add more tests

    Artyom Nikitin committed Nov 15, 2020
    Configuration menu
    Copy the full SHA
    fb04fcc View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2020

  1. chore: bump version

    Artyom Nikitin committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    0b680ea View commit details
    Browse the repository at this point in the history

  2. test: update

    Artyom Nikitin committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    c37b40f View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2020

  1. test: add toy jsonpointer example

    Artyom Nikitin committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    0994bfe View commit details
    Browse the repository at this point in the history

  2. test: fix for py27

    Artyom Nikitin committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    d24fa96 View commit details
    Browse the repository at this point in the history

  3. style: fix typo

    Artyom Nikitin committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    4d07392 View commit details
    Browse the repository at this point in the history

  4. chore: revert version bump

    Artyom Nikitin committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    c9613e3 View commit details
    Browse the repository at this point in the history

  5. Update coveragerc and require coverage.

    @dave-shawley
    dave-shawley committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    bfc0f5a View commit details
    Browse the repository at this point in the history

  6. fix #110: Validate patch documents during creation.

    @dave-shawley
    dave-shawley committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    a7ef7e8 View commit details
    Browse the repository at this point in the history

  7. Add tests for operation doc structure.

    @dave-shawley
    dave-shawley committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    b44e7a2 View commit details
    Browse the repository at this point in the history

  8. tests: moar

    Artyom Nikitin committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    50fb942 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2020

  1. Merge pull request #108 from paperlessreceipts/custom-types 

    Make it possible for from_diff to support custom types (issue #107)
    @stefankoegl
    stefankoegl authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    511cbc2 View commit details
    Browse the repository at this point in the history

  2. Explain the call to _get_operation in __init__.

    @dave-shawley
    dave-shawley committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    3bb3351 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #116 from dave-shawley/validate-patch-doc 

    Fix #110 - validate patch document during creation
    @stefankoegl
    stefankoegl authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    24b5e86 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2020

  1. Merge branch 'master' into feature/custom-pointer 

    # Conflicts:
#	jsonpatch.py
#	tests.py
    Artyom Nikitin committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    eca4f8a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #114 from tzoiker/feature/custom-pointer 

    Allow custom JSON pointer class
    @stefankoegl
    stefankoegl authored Nov 23, 2020
    Configuration menu
    Copy the full SHA
    3a95635 View commit details
    Browse the repository at this point in the history

  3. Update Python to 3.9

    @stefankoegl
    stefankoegl committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    3972a8e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #117 from stefankoegl/py3.9 

    Update Python to 3.9
    @stefankoegl
    stefankoegl authored Nov 23, 2020
    Configuration menu
    Copy the full SHA
    f3c46e8 View commit details
    Browse the repository at this point in the history

  5. feat: make operations class-based

    Artyom Nikitin committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    b8083d7 View commit details
    Browse the repository at this point in the history

  6. test: custom operations

    Artyom Nikitin committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    1268e09 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2020

  1. test: fix

    Artyom Nikitin committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    9310d48 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2020

  1. Merge pull request #118 from tzoiker/fix/json-patch-ops 

    Declare json-patch operations as a class-based attribute
    @stefankoegl
    stefankoegl authored Dec 1, 2020
    Configuration menu
    Copy the full SHA
    57e4273 View commit details
    Browse the repository at this point in the history

  2. Bump version to 1.28

    @stefankoegl
    stefankoegl committed Dec 1, 2020
    Configuration menu
    Copy the full SHA
    a9a83b5 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2021

  1. Fix make_patch

    @RyanSept
    RyanSept committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    8d15ed5 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2021

  1. Add comment

    @RyanSept
    RyanSept committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    78abec1 View commit details
    Browse the repository at this point in the history

  2. Update comment

    @RyanSept
    RyanSept committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    f6b26b2 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2021

  1. Merge pull request #122 from RyanSept/119-120-fix-diffbuilder 

    #119 #120 Fix make_patch() to avoid casting numeric string to int on item moved
    @stefankoegl
    stefankoegl authored Mar 2, 2021
    Configuration menu
    Copy the full SHA
    25762af View commit details
    Browse the repository at this point in the history

  2. Fix version number v1.30

    @stefankoegl
    stefankoegl committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    dbea3db View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2021

  1. Add support for preserving Unicode characters in jsonpatch CLI 

    If the JSON content contains some Unicode characters, the jsonpatch
final output will encode the Unicode character using ASCII (i.e
`\u0394`). This behaviour comes from the module `json.dump()` governed
by a flag `ensure_ascii`[1].

For example:

```json
/* patch.json */
[{
  "op": "add",
  "path": "/SomeUnicodeSamples",
  "value": "𝒞𝘋𝙴𝓕ĢȞỈ𝕵 đ áê 🤩 äÄöÖüÜß"
}]
```

After applying the patch on an empty source file `{}`, this is the
output:

```json
{"SomeUnicodeSamples": "\ud835\udc9e\ud835\ude0b...\u00fc\u00dc\u00df"}
```

This commit adds a flag `-u|--preserve-unicode` in the jsonpatch CLI
to configure the behaviour of `json.dump`'s `ensure_ascii` flag.

Using the `--preserve-unicode` flag, the cli will print the Unicode
characters as-is without any encoding.

[1]: https://docs.python.org/3/library/json.html#basic-usage
    @Genzer
    Genzer committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    974d54f View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2021

  1. Merge pull request #127 from Genzer/master 

    Add support for preserving Unicode characters in jsonpatch CLI
    @stefankoegl
    stefankoegl authored Mar 4, 2021
    Configuration menu
    Copy the full SHA
    cc37e25 View commit details
    Browse the repository at this point in the history

  2. Remove failing pypy build

    @stefankoegl
    stefankoegl committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    7a6d76a View commit details
    Browse the repository at this point in the history

  3. Bump version to 1.31

    @stefankoegl
    stefankoegl committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    d1cfec3 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2021

  1. closes #129

    @Penguin2600
    Penguin2600 committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    5cdb066 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2021

  1. Merge pull request #130 from Penguin2600/master 

    Closes #129
    @stefankoegl
    stefankoegl authored Mar 13, 2021
    Configuration menu
    Copy the full SHA
    ce15b23 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:stefankoegl/python-json-patch

    @stefankoegl
    stefankoegl committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    fd9fa23 View commit details
    Browse the repository at this point in the history

  3. Bump version to 1.32

    @stefankoegl
    stefankoegl committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    55d4816 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2021

  1. FIX: TypeError when one forgot to put its operation in a list.

    @JulienPalard
    JulienPalard committed Mar 21, 2021
    Configuration menu
    Copy the full SHA
    c9bfb91 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2021

  1. Merge pull request #132 from JulienPalard/mdk/TypeError 

    FIX: TypeError when one forgot to put its operation in a list.
    @stefankoegl
    stefankoegl authored Mar 29, 2021
    Configuration menu
    Copy the full SHA
    a652648 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2021

  1. fix invalid remove index

    Vu-Hoang Phan committed Apr 6, 2021
    Configuration menu
    Copy the full SHA
    db194f8 View commit details
    Browse the repository at this point in the history

  2. remove unused import

    Vu-Hoang Phan committed Apr 6, 2021
    Configuration menu
    Copy the full SHA
    46eef55 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2021

  1. Merge pull request #134 from Ventilateur/b/fix-invalid-remove-index 

    B/fix invalid remove index
    @stefankoegl
    stefankoegl authored Apr 12, 2021
    Configuration menu
    Copy the full SHA
    e0b3a9b View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2021

  1. docs: fix simple typo, raies -> raise (#135)

    @timgates42
    timgates42 authored Sep 14, 2021
    Configuration menu
    Copy the full SHA
    714df3c View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. feat(jsondiff): Add support for preserving Unicode characters (#145) 

    Mostly same as #127
    @hirmiura
    hirmiura authored Jun 16, 2023
    Configuration menu
    Copy the full SHA
    a76f742 View commit details
    Browse the repository at this point in the history

  2. Update license text to match official 3-clause-BSD (#142)

    @skypanther
    skypanther authored Jun 16, 2023
    Configuration menu
    Copy the full SHA
    33562b0 View commit details
    Browse the repository at this point in the history

  3. Switch to GitHub actions (#144) 

    * Switch to GitHub actions
* add support for Python 3.11, remove 3.5, 3.6
    @stefankoegl
    stefankoegl authored Jun 16, 2023
    Configuration menu
    Copy the full SHA
    45cfe90 View commit details
    Browse the repository at this point in the history

  4. bump version to 1.33

    @stefankoegl
    stefankoegl committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    0b05203 View commit details
    Browse the repository at this point in the history

  5. add .readthedocs.yaml 

    https://blog.readthedocs.com/migrate-configuration-v2/
    @stefankoegl
    stefankoegl committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    e5a007a View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. Update documentation to include a link to the GitHub repo and install… 

    …ation instructions (#147)
    @werdnum
    werdnum authored Jun 28, 2023
    Configuration menu
    Copy the full SHA
    73c36f2 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. chore: add Python 3.10-3.12 as supported versions (#156)

    @hf-kklein
    hf-kklein authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    a22e05a View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. Fix tests for Python 3.12 (#162) 

    unittest.TestCase.assertEquals has been removed in Python 3.12;
unittest.TestCase.assertEqual should be used instead[1].

[1] https://docs.python.org/3/whatsnew/3.12.html#id3
    @CyrilRoelandteNovance
    CyrilRoelandteNovance authored Aug 5, 2024
    Configuration menu
    Copy the full SHA
    d8e1a6e View commit details
    Browse the repository at this point in the history