summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kögl <stefan@skoegl.net>2018-01-16 15:49:15 +0100
committerGitHub <noreply@github.com>2018-01-16 15:49:15 +0100
commit0642254fc6fb05b73a0835a1d3d93eef5c6beec5 (patch)
tree6441bf79ef116f321b4873f6d740ef9362da5452
parent4ff73987280269ea52bf7a0ae178b9dccae9786a (diff)
parent02fa1f8da30cf8d15257c95b4b00b94956e2d368 (diff)
downloadpython-json-patch-0642254fc6fb05b73a0835a1d3d93eef5c6beec5.tar.gz
Merge pull request #81 from hugovk/rm-3.3
Drop support for EOL Python 3.3
-rw-r--r--.travis.yml1
-rw-r--r--README.md12
-rwxr-xr-xbin/jsondiff1
-rw-r--r--doc/index.rst2
-rwxr-xr-xext_tests.py1
-rw-r--r--jsonpatch.py2
-rw-r--r--setup.py4
-rwxr-xr-xtests.py2
8 files changed, 12 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index fe615bf..12712a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
language: python
python:
- '2.7'
-- '3.3'
- '3.4'
- '3.5'
- '3.6'
diff --git a/README.md b/README.md
index 5bdf287..ff2b142 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,24 @@
-python-json-patch [![Build Status](https://secure.travis-ci.org/stefankoegl/python-json-patch.png?branch=master)](https://travis-ci.org/stefankoegl/python-json-patch) [![Coverage Status](https://coveralls.io/repos/stefankoegl/python-json-patch/badge.png?branch=master)](https://coveralls.io/r/stefankoegl/python-json-patch?branch=master)
+python-json-patch
=================
+
+[![PyPI version](https://img.shields.io/pypi/v/jsonpatch.svg)](https://pypi.python.org/pypi/jsonpatch/)
+[![Supported Python versions](https://img.shields.io/pypi/pyversions/jsonpatch.svg)](https://pypi.python.org/pypi/jsonpatch/)
+[![Build Status](https://travis-ci.org/stefankoegl/python-json-patch.png?branch=master)](https://travis-ci.org/stefankoegl/python-json-patch)
+[![Coverage Status](https://coveralls.io/repos/stefankoegl/python-json-patch/badge.png?branch=master)](https://coveralls.io/r/stefankoegl/python-json-patch?branch=master)
+
Applying JSON Patches in Python
-------------------------------
Library to apply JSON Patches according to
[RFC 6902](http://tools.ietf.org/html/rfc6902)
-See Sourcecode for Examples
+See source code for examples
* Website: https://github.com/stefankoegl/python-json-patch
* Repository: https://github.com/stefankoegl/python-json-patch.git
* Documentation: https://python-json-patch.readthedocs.org/
* PyPI: https://pypi.python.org/pypi/jsonpatch
-* Travis-CI: https://travis-ci.org/stefankoegl/python-json-patch
+* Travis CI: https://travis-ci.org/stefankoegl/python-json-patch
* Coveralls: https://coveralls.io/r/stefankoegl/python-json-patch
Running external tests
diff --git a/bin/jsondiff b/bin/jsondiff
index 54b4a61..b79188b 100755
--- a/bin/jsondiff
+++ b/bin/jsondiff
@@ -4,7 +4,6 @@
from __future__ import print_function
import sys
-import os.path
import json
import jsonpatch
import argparse
diff --git a/doc/index.rst b/doc/index.rst
index cbae4ff..2f46921 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -7,7 +7,7 @@ python-json-patch
=================
*python-json-patch* is a Python library for applying JSON patches (`RFC 6902
-<http://tools.ietf.org/html/rfc6902>`_). Python 2.7 and 3.3-3.6 are
+<http://tools.ietf.org/html/rfc6902>`_). Python 2.7 and 3.4+ are
supported. Tests are run on both CPython and PyPy.
diff --git a/ext_tests.py b/ext_tests.py
index 05576c6..2770c8e 100755
--- a/ext_tests.py
+++ b/ext_tests.py
@@ -34,7 +34,6 @@
""" Script to run external tests, eg from
https://github.com/json-patch/json-patch-tests """
-from functools import partial
import doctest
import unittest
import jsonpatch
diff --git a/jsonpatch.py b/jsonpatch.py
index 422812d..48dc2f8 100644
--- a/jsonpatch.py
+++ b/jsonpatch.py
@@ -37,8 +37,6 @@ from __future__ import unicode_literals
import collections
import copy
import functools
-import inspect
-import itertools
import json
import sys
diff --git a/setup.py b/setup.py
index 0776c41..1051ecc 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,8 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-import sys
import io
import re
-import warnings
try:
from setuptools import setup
has_setuptools = True
@@ -58,7 +56,6 @@ CLASSIFIERS = [
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
@@ -81,5 +78,6 @@ setup(name=PACKAGE,
package_data={'': ['requirements.txt']},
scripts=['bin/jsondiff', 'bin/jsonpatch'],
classifiers=CLASSIFIERS,
+ python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
**OPTIONS
)
diff --git a/tests.py b/tests.py
index 614d844..548d28b 100755
--- a/tests.py
+++ b/tests.py
@@ -366,7 +366,7 @@ class MakePatchTestCase(unittest.TestCase):
src = [8, 7, 2, 1, 0, 9, 4, 3, 5, 6]
dest = [7, 2, 1, 0, 9, 4, 3, 6, 5, 8]
- patch = jsonpatch.make_patch(src, dest)
+ jsonpatch.make_patch(src, dest)
def test_issue76(self):
""" Make sure op:remove does not include a 'value' field """