Moved the metadata into setup.cfg.

Added `pyproject.toml`.
Version is now fetched and populated automatically from git tags using setuptools_scm.
Metadata stored in source files is fetched using `read_version`.
Got rid of raw scripts, using `console_scripts` entry point since now.
Disabled CI for python `2.7` because of `File "tests.py", line 1069, in <module> m = __import__(module, fromlist=[module]) TypeError: Item in "from list'' must be str, not unicode`

Author: KOLANICH

.gitignore

@@ -1,4 +1,5 @@
-*.pyc
+/jsonpatch/version.py
+*.py[co]
 build
 .coverage
 dist

.travis.yml

@@ -1,7 +1,6 @@
 dist: xenial
 language: python
 python:
-- '2.7'
 - '3.5'
 - '3.6'
 - '3.7'
@@ -10,10 +9,6 @@ python:
 - 3.10-dev
 - nightly
 - pypy3
-addons:
-  apt:
-    packages:
-    - pandoc
 install:
 - travis_retry pip install -r requirements.txt
 - travis_retry pip install coveralls

jsonpatch.py renamed to jsonpatch/__init__.py

@@ -66,7 +66,9 @@
     str = unicode
 
 # Will be parsed by setup.py to determine package metadata
-__author__ = 'Stefan Kögl <stefan@skoegl.net>'
+__author__ = 'Stefan Kögl'
+__email__ = 'stefan@skoegl.net'
+__author__ += ' <' + __email__ + '>'
 __version__ = '1.32'
 __website__ = 'https://github.com/stefankoegl/python-json-patch'
 __license__ = 'Modified BSD License'

jsonpatch/cli/__init__.py

@@ -5,17 +5,18 @@
 
 import sys
 import json
-import jsonpatch
 import argparse
 
+from .. import __version__, make_patch
+
 
 parser = argparse.ArgumentParser(description='Diff two JSON files')
 parser.add_argument('FILE1', type=argparse.FileType('r'))
 parser.add_argument('FILE2', type=argparse.FileType('r'))
 parser.add_argument('--indent', type=int, default=None,
                     help='Indent output by n spaces')
 parser.add_argument('-v', '--version', action='version',
-                    version='%(prog)s ' + jsonpatch.__version__)
+                    version='%(prog)s ' + __version__)
 
 
 def main():
@@ -30,7 +31,7 @@ def diff_files():
     args = parser.parse_args()
     doc1 = json.load(args.FILE1)
     doc2 = json.load(args.FILE2)
-    patch = jsonpatch.make_patch(doc1, doc2)
+    patch = make_patch(doc1, doc2)
     if patch.patch:
         print(json.dumps(patch.patch, indent=args.indent))
         sys.exit(1)

bin/jsondiff renamed to jsonpatch/cli/jsondiff.py

@@ -4,10 +4,11 @@
 import sys
 import os.path
 import json
-import jsonpatch
 import tempfile
 import argparse
 
+from .. import __version__, apply_patch
+
 
 parser = argparse.ArgumentParser(
     description='Apply a JSON patch on a JSON file')
@@ -23,7 +24,7 @@
 parser.add_argument('-i', '--in-place', action='store_true',
                     help='Modify ORIGINAL in-place instead of to stdout')
 parser.add_argument('-v', '--version', action='version',
-                    version='%(prog)s ' + jsonpatch.__version__)
+                    version='%(prog)s ' + __version__)
 parser.add_argument('-u', '--preserve-unicode', action='store_true',
                     help='Output Unicode character as-is without using Code Point')
 
@@ -39,7 +40,7 @@ def patch_files():
     args = parser.parse_args()
     doc = json.load(args.ORIGINAL)
     patch = json.load(args.PATCH)
-    result = jsonpatch.apply_patch(doc, patch)
+    result = apply_patch(doc, patch)
 
     if args.in_place:
         dirname = os.path.abspath(os.path.dirname(args.ORIGINAL.name))

bin/jsonpatch renamed to jsonpatch/cli/jsonpatch.py

@@ -0,0 +1,13 @@
+[build-system]
+requires = ["setuptools>=44", "wheel", "setuptools_scm[toml]>=3.4.3", "read_version[toml] >= 0.3.0"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+write_to = "jsonpatch/version.py"
+write_to_template = "__version__ = '{version}'\n"
+
+[tool.read_version]
+author = "jsonpatch.__init__:__author__"
+author_email = "jsonpatch.__init__:__email__"
+url = "jsonpatch.__init__:__website__"
+license = "jsonpatch.__init__:__license__"

pyproject.toml

@@ -1,3 +1,7 @@
+build
+setuptools
+setuptools_scm
+read_version
 coverage
 wheel
 pypandoc

requirements-dev.txt

@@ -1,2 +1,44 @@
+[metadata]
+name = jsonpatch
+description = Apply JSON-Patches (RFC 6902)
+long_description = file: README.md
+long_description_content_type = text/markdown
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Environment :: Console
+    Intended Audience :: Developers
+    License :: OSI Approved :: BSD License
+    Operating System :: OS Independent
+    Programming Language :: Python
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    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
+    Topic :: Utilities
+project_urls =
+    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.org/pypi/jsonpatch
+    Tests = https://travis-ci.org/stefankoegl/python-json-patch
+    Test Coverage = https://coveralls.io/r/stefankoegl/python-json-patch
+
+[options]
+packages = jsonpatch, jsonpatch.cli
+install_requires = jsonpointer>=1.9
+python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
+
+[options.entry_points]
+console_scripts =
+    jsondiff = jsonpatch.cli.jsondiff:main
+    jsonpatch = jsonpatch.cli.jsonpatch:main
+
 [bdist_wheel]
 universal = 1