Skip to content

Commit

Permalink
Merge pull request #81 from hugovk/rm-3.3
Browse files Browse the repository at this point in the history
Drop support for EOL Python 3.3
  • Loading branch information
stefankoegl committed Jan 16, 2018
2 parents 4ff7398 + 02fa1f8 commit 0642254
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 13 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: python
python:
- '2.7'
- '3.3'
- '3.4'
- '3.5'
- '3.6'
Expand Down
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion bin/jsondiff
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from __future__ import print_function

import sys
import os.path
import json
import jsonpatch
import argparse
Expand Down
2 changes: 1 addition & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.


Expand Down
1 change: 0 additions & 1 deletion ext_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions jsonpatch.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
import collections
import copy
import functools
import inspect
import itertools
import json
import sys

Expand Down
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -58,7 +56,6 @@
'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',
Expand All @@ -81,5 +78,6 @@
package_data={'': ['requirements.txt']},
scripts=['bin/jsondiff', 'bin/jsonpatch'],
classifiers=CLASSIFIERS,
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
**OPTIONS
)
2 changes: 1 addition & 1 deletion tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ def test_issue40(self):

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 """
Expand Down

0 comments on commit 0642254

Please sign in to comment.