summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #96: Don't clobber existing IDs with 'auto_id' HEADmasterKenn Knowles2021-06-242-10/+22
|\
| * don't clobber IDs if they existSimon Kelly2021-06-242-12/+11
| | | | | | | | | | | | If a field exists with the name of the `auto_id_field` it should be used as is without converting it to an AutoID. The auto ID functionality should only kick in if and ID field does not exist.
| * test case for existing auto idSimon Kelly2021-06-241-0/+13
|/
* Merge pull request #75: Fixed TravisCI buildKenn Knowles2019-11-132-10/+7
|\
| * Fixed README.md with actual tested python versionsAlexander Iljushkin2019-10-131-2/+1
| |
| * Fixed travis buildAlexander Iljushkin2019-10-131-8/+6
|/
* is_singular function was missing self argument adding self argument (#52)Nikhil Patil2019-04-021-1/+1
|
* Add support for python 3.7 (#65)Eric Hayes2019-04-022-2/+7
| | | | | | * Adding support for 3.7. This was previously left out due to some issues mentioned in 3.7-dev for travis-ci (see: https://github.com/travis-ci/travis-ci/issues/9815), but those issues appear to be resolved now. * Python 2.6 appears to be failing due to deprecation notice, 3.7 requires a workaround since this build is currently using trusty instead of xenial.
* Merge pull request #62: Adding Python 3.5 and 3.6 to the Travis configKenn Knowles2018-11-142-4/+6
|\
| * Updating READMECooper Benson2018-08-201-3/+3
| |
| * Adding Python 3.5 and 3.6 to the travis configCooper Benson2018-08-201-1/+3
|/
* Merge pull request #61 from kennknowles/sk/revert-allow-specialSimon Kelly2018-07-312-3/+2
|\ | | | | Revert "allow # in IDs"
| * Revert "allow # in IDs"Simon Kelly2018-07-302-3/+2
|/ | | | This reverts commit 1310c0c63d3db1ff3eea36501f7d68958eae5f8b.
* Merge pull request #59: allow # in IDsKenn Knowles2018-07-303-3/+7
|\
| * fix python 3.2 buildSimon Kelly2018-07-271-1/+4
| |
| * allow # in IDsSimon Kelly2018-07-272-2/+3
|/
* Merge pull request #33 from abloomston/nullObjsKenn Knowles2016-12-172-3/+4
|\ | | | | Return empty result instead of crashing on index into None
| * fix for foo.[*] where foo is nullAdam Bloomston2015-10-011-2/+2
| |
| * added test for foo.[*] where foo is nullAdam Bloomston2015-10-011-1/+2
| |
* | Remove another --use-mirrorsKenn Knowles2016-12-171-1/+1
| |
* | Remove pip --use-mirrors from .travis.ymlKenn Knowles2016-12-171-1/+1
| |
* | Merge pull request #45 from Evgenus/patch-1Kenn Knowles2016-12-171-0/+13
|\ \ | | | | | | Add basics of how to load JSON in Python to README.rst.
| * | Update README.rstEugene Chernyshov2016-12-171-0/+13
|/ / | | | | fixes #44
* | Merge #28Kenn Knowles2016-10-042-1/+120
|\ \ | |/ |/|
| * Add tests and fixes for updateKenn Knowles2016-10-043-72/+95
| |
| * Implemented update method on most JSONPath descendents. Tests included.Josh Benner2015-07-132-0/+96
| |
* | Merge pull request #27 from dhduvall/masterKenn Knowles2015-08-011-0/+1
|\ \ | |/ |/| Add tests to distribution
| * Add tests to distributionDanek Duvall2015-07-011-0/+1
|/
* Version 1.4.01.4.0Kenn Knowles2015-04-181-1/+1
|
* Merge pull request #18 from kharakawa/fix-setup-pyKenn Knowles2015-01-121-1/+1
|\ | | | | Fix setup.py so that it will include jsonpath_rw/bin subdirectory
| * Fix setup.py so that it will include jsonpath_rw/bin subdirectory into the ↵HARAKAWA, Koichi2014-08-301-1/+1
| | | | | | | | distribution.
* | Merge pull request #20 from frewsxcv/patch-2Kenn Knowles2014-12-201-0/+1
|\ \ | | | | | | Test on Python 3.4
| * | Test on Python 3.4Corey Farwell2014-12-181-0/+1
| |/
* | Merge pull request #19 from frewsxcv/patch-1Kenn Knowles2014-12-201-1/+1
|\ \ | |/ |/| Enable syntax highlighting in README
| * Enable syntax highlighting in READMECorey Farwell2014-12-181-1/+1
|/
* Merge pull request #16 from nchammas/masterKenn Knowles2014-04-181-3/+2
|\ | | | | Minor formatting fix for syntax table
| * Minor formatting fix for syntax tablenchammas2014-04-181-3/+2
| | | | | | Moved the `|`/union operator into the syntax table.
* | Merge pull request #15 from nchammas/masterKenn Knowles2014-04-181-0/+3
|\ \ | |/ | | Fixed quick start example of expression building.
| * Fixed quick start example of expression building.nchammas2014-04-181-0/+3
|/ | | Added imports of `Fields()` and `Slice()` methods so that the final line of the quick start works. An alternate fix would be to prepend calls to those methods with `jsonpath.`.
* Merge pull request #13 from gera/patch-1Kenn Knowles2014-04-011-1/+1
|\ | | | | Fix Where to work as advertised
| * Fix Where to work as advertisedDevendra Gera2014-04-011-1/+1
| | | | | | This actually uses the right expression to filter the selected subdata and not just match on the whole data which just determines if there will be any output at all or not.
* | Merge pull request #14 from gera/patch-2Kenn Knowles2014-04-011-1/+1
|\ \ | |/ |/| Fix str conversion of numerical fields
| * Fix str conversion of numerical fieldsDevendra Gera2014-04-011-1/+1
|/
* Note pypy issues in READMEKenn Knowles2014-02-071-1/+2
|
* Remove pypy from travis-ci since it segfaultsKenn Knowles2014-02-071-1/+0
|
* Version 1.3.01.3.0Kenn Knowles2014-02-072-2/+2
|
* Adjustments and tests for jsonpath.py command line scriptKenn Knowles2014-02-077-34/+132
|
* Merge pull request #12 from hakanw/jsonpath_scriptKenn Knowles2014-02-072-0/+52
|\ | | | | Add jsonpath.py script that can be used when installing this package
| * improve usageHåkan Waara2014-01-281-2/+4
| |
| * add jsonpath.py script based on https://github.com/makefu/jsonpath (but ↵Håkan Waara2014-01-272-0/+50
|/ | | | improved and expanded) that will be installed in bin/. this means anyone installing this package will also get a jsonpath.py that will work on the command line