summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump version to 1.23v1.23Stefan Kögl2018-04-021-1/+1
|
* Merge pull request #75 from stefankoegl/jsonptrStefan Kögl2018-04-022-3/+34
|\ | | | | Expect path/from attributes also as JsonPoiner instances (#60)
| * Expect path/from attributes also as JsonPoiner instances (#60)jsonptrStefan Kögl2017-12-032-3/+34
| |
* | Add project URLs to setup.pyStefan Kögl2018-04-021-0/+8
| |
* | Bump version to 1.22v1.22Stefan Kögl2018-04-021-1/+1
| |
* | Add tests.js to MANIFEST.in, fixes #82Stefan Kögl2018-03-111-0/+1
| |
* | Merge pull request #81 from hugovk/rm-3.3Stefan Kögl2018-01-168-13/+12
|\ \ | | | | | | Drop support for EOL Python 3.3
| * | Update badges and fix typosHugo2018-01-161-3/+9
| | |
| * | Remove ununsed imports and variablesHugo2018-01-165-7/+1
| | |
| * | Drop support for EOL Python 3.3Hugo2018-01-163-3/+2
|/ /
* | Bump version to 1.21v1.21Stefan Kögl2017-12-301-1/+1
| |
* | Merge pull request #77 from ostackbrian/issue-76Stefan Kögl2017-12-302-3/+16
|\ \ | |/ |/| Remove extraneous 'value' field for op:remove (#76)
| * Remove extraneous 'value' field for op:remove (#76)Brian Rosmaita2017-12-042-3/+16
|/ | | | | | | | | | | | 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] https://github.com/stefankoegl/python-json-patch/commit/03aa14e8209d59522476726d55bfabf86a28929e
* Remove broken badges from READMEStefan Kögl2017-11-251-1/+1
|
* Update ext_tests.py for current versions of coverageStefan Kögl2017-11-251-9/+10
|
* Add test case for issue reported in #41Stefan Kögl2017-11-251-0/+10
|
* Add test case for issue reported in #74Stefan Kögl2017-11-251-0/+11
|
* Bump version to 1.20v1.20Stefan Kögl2017-11-251-1/+1
| | | | | | | 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 https://github.com/stefankoegl/python-json-patch/issues/67
* Disable tests for Python 2.6Stefan Kögl2017-11-251-1/+0
| | | | | This was disabled before, and was erroneously re-enabled in ae15a3be2c37e6d37286dc0e492993ebf31447c4
* Deploy to PyPI from Travis-CIStefan Kögl2017-11-251-0/+14
|
* Reformat .travis.ymlStefan Kögl2017-11-251-15/+15
|
* Merge branch 'jsondiff'Stefan Kögl2017-11-253-290/+318
|\
| * Merge branch 'master' into jsondiffStefan Kögl2017-11-254-30/+6
| |\
| * | Show coverage report after testsjsondiffStefan Kögl2017-10-291-1/+2
| | |
| * | Fix unicode dict keys in Python 2Stefan Kögl2017-09-101-0/+2
| | |
| * | Improve optimizationsStefan Kögl2017-09-102-6/+22
| | |
| * | Code styleStefan Kögl2017-09-101-13/+30
| | |
| * | Rename old{path,key} to from_{path,key}Stefan Kögl2017-09-101-18/+18
| | |
| * | Simplify compatibility codeStefan Kögl2017-09-101-18/+7
| | |
| * | Redefine _compare_info class as DiffBuilderStefan Kögl2017-09-101-98/+98
| | |
| * | Break long linesStefan Kögl2017-09-101-6/+30
| | |
| * | Merge _op_base classes into PatchOperation classesStefan Kögl2017-09-101-112/+113
| | |
| * | Re-enable previously disabled optimization testsStefan Kögl2017-09-101-6/+2
| | |
| * | Remove re-creation of no-optimization patchStefan Kögl2017-09-101-12/+1
| | |
| * | Drop in patch creation from jsondiffStefan Kögl2017-09-101-263/+256
| | | | | | | | | | | | https://github.com/nxsofsys/jsondiff
| * | Remove support for Python 3.2Stefan Kögl2017-09-102-2/+0
| | |
* | | Merge branch 'jsonload-no-override'Stefan Kögl2017-11-251-2/+2
|\ \ \ | |_|/ |/| |
| * | Avoid overriding json.load (fixes #37)jsonload-no-overrideStefan Kögl2017-10-211-2/+2
|/ /
* | Update supported versions in docsStefan Kögl2017-10-211-3/+3
| |
* | Remove support for Python 2.6Stefan Kögl2017-10-212-25/+3
| |
* | Remove support for Python 3.2Stefan Kögl2017-10-212-4/+0
|/
* Remove trailing whitespaceStefan Kögl2017-09-102-3/+3
|
* Merge pull request #65 from thunderstruck47/masterStefan Kögl2017-09-102-3/+14
|\ | | | | fixing array diff bug (issue #30)
| * added a test case for issue #30thunderstruck472017-07-261-1/+9
| |
| * fixing array diff bug (issue #30)thunderstruck472017-07-261-2/+5
| |
* | Merge branch 'list_tests'Stefan Kögl2017-09-031-7/+52
|\ \ | |/ |/|
| * Disable tests for disabled optimizationsStefan Kögl2017-09-031-2/+6
| |
| * Merge branch 'list_tests@v1.13' into list_testsStefan Kögl2017-09-031-7/+48
| |\ |/ / | | | | https://github.com/selurvedu/python-json-patch
| * Merge branch 'list_tests@v1.9' into list_tests@v1.13selurvedu2016-04-081-7/+48
| |\ | | | | | | | | | | | | Conflicts: tests.py
| | * Move list-related testcases into separate classselurvedu2016-04-081-0/+4
| | |