Skip to content
Snippets Groups Projects
Commit d9a000dd authored by Thomas Goirand's avatar Thomas Goirand
Browse files

Merge tag '2.1' into debian/xena

release v2.1
parents 85f4d154 7d146bd7
No related branches found
No related tags found
No related merge requests found
language: python
python:
- '2.7'
- '3.4'
- '3.5'
- '3.6'
- 3.6-dev
- 3.7-dev
- '3.7'
- '3.8'
- '3.9'
- 3.10-dev
- nightly
- pypy
- pypy3
install:
- travis_retry pip install coveralls
......
......@@ -3,8 +3,8 @@ python-json-pointer
[![PyPI version](https://img.shields.io/pypi/v/jsonpointer.svg)](https://pypi.python.org/pypi/jsonpointer/)
[![Supported Python versions](https://img.shields.io/pypi/pyversions/jsonpointer.svg)](https://pypi.python.org/pypi/jsonpointer/)
[![Build Status](https://travis-ci.org/stefankoegl/python-json-pointer.png?branch=master)](https://travis-ci.org/stefankoegl/python-json-pointer)
[![Coverage Status](https://coveralls.io/repos/stefankoegl/python-json-pointer/badge.png?branch=master)](https://coveralls.io/r/stefankoegl/python-json-pointer?branch=master)
[![Build Status](https://travis-ci.org/stefankoegl/python-json-pointer.svg?branch=master)](https://travis-ci.org/stefankoegl/python-json-pointer)
[![Coverage Status](https://coveralls.io/repos/stefankoegl/python-json-pointer/badge.svg?branch=master)](https://coveralls.io/r/stefankoegl/python-json-pointer?branch=master)
Resolve JSON Pointers in Python
......
......@@ -16,10 +16,10 @@ method is basically a deep ``get``.
>>> resolve_pointer(obj, '/foo') == obj['foo']
True
>>> resolve_pointer(obj, '/foo/another%20prop') == obj['foo']['another prop']
>>> resolve_pointer(obj, '/foo/another prop') == obj['foo']['another prop']
True
>>> resolve_pointer(obj, '/foo/another%20prop/baz') == obj['foo']['another prop']['baz']
>>> resolve_pointer(obj, '/foo/another prop/baz') == obj['foo']['another prop']['baz']
True
>>> resolve_pointer(obj, '/foo/anArray/0') == obj['foo']['anArray'][0]
......
......@@ -36,7 +36,7 @@ from __future__ import unicode_literals
# Will be parsed by setup.py to determine package metadata
__author__ = 'Stefan Kögl <stefan@skoegl.net>'
__version__ = '2.0'
__version__ = '2.1'
__website__ = 'https://github.com/stefankoegl/python-json-pointer'
__license__ = 'Modified BSD License'
......@@ -162,7 +162,7 @@ class EndOfList(object):
class JsonPointer(object):
"""A JSON Pointer that can reference parts of an JSON document"""
"""A JSON Pointer that can reference parts of a JSON document"""
# Array indices must not contain:
# leading zeros, signs, spaces, decimals, etc
......@@ -179,7 +179,7 @@ class JsonPointer(object):
parts = pointer.split('/')
if parts.pop(0) != '':
raise JsonPointerException('location must starts with /')
raise JsonPointerException('Location must start with /')
parts = [unescape(part) for part in parts]
self.parts = parts
......@@ -217,7 +217,7 @@ class JsonPointer(object):
if len(self.parts) == 0:
if inplace:
raise JsonPointerException('cannot set root in place')
raise JsonPointerException('Cannot set root in place')
return value
if not inplace:
......
wheel
pypandoc==1.4
twine>=1.11.0
setuptools>=38.6.0
......@@ -26,13 +26,10 @@ DESCRIPTION = docstrings[0]
# Extract name and e-mail ("Firstname Lastname <mail@example.org>")
AUTHOR, EMAIL = re.match(r'(.*) <(.*)>', AUTHOR_EMAIL).groups()
try:
from pypandoc import convert
read_md = lambda f: convert(f, 'rst')
except ImportError:
print('warning: pypandoc module not found, could not convert '
'Markdown to RST')
read_md = lambda f: open(f, 'r').read()
with open('README.md') as readme:
long_description = readme.read()
CLASSIFIERS = [
'Development Status :: 5 - Production/Stable',
......@@ -44,9 +41,11 @@ CLASSIFIERS = [
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Software Development :: Libraries',
......@@ -56,7 +55,8 @@ CLASSIFIERS = [
setup(name=PACKAGE,
version=VERSION,
description=DESCRIPTION,
long_description=read_md('README.md'),
long_description=long_description,
long_description_content_type="text/markdown",
author=AUTHOR,
author_email=EMAIL,
license=LICENSE,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment