diff options
| author | Thomas Goirand <zigo@debian.org> | 2024-02-23 13:39:15 +0100 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2024-02-23 22:26:17 +0000 |
| commit | 7883dad2273c0eed995786fe4a24e5d5bfc70bff (patch) | |
| tree | 2c11cd2c8efc8087b8a29a9d36a4f3ca62478c6e | |
| parent | fbda85d035871be9cd86dc8f9e9f2d9300ea0359 (diff) | |
2.4-1 (patches unapplied)import/2.4-1debian/experimental
Imported using git-ubuntu import.
Notes
Notes:
* New upstream release.
| -rw-r--r-- | .github/workflows/test.yaml | 33 | ||||
| -rw-r--r-- | .travis.yml | 32 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | jsonpointer.py | 2 | ||||
| -rw-r--r-- | makefile | 2 | ||||
| -rw-r--r-- | setup.py | 6 | ||||
| -rwxr-xr-x | tests.py | 24 |
7 files changed, 48 insertions, 57 deletions
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml new file mode 100644 index 0000000..dbc52cb --- /dev/null +++ b/.github/workflows/test.yaml @@ -0,0 +1,33 @@ +name: Python package + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11"] + + steps: + - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install flake8 pytest + pip install coveralls +# - name: Lint with flake8 +# run: | + # stop the build if there are Python syntax errors or undefined names + # flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics + # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide + # flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + - name: Test + run: | + coverage run --source=jsonpatch tests.py diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 62ad875..0000000 --- a/.travis.yml +++ /dev/null @@ -1,32 +0,0 @@ -language: python -python: -- '2.7' -- '3.5' -- '3.6' -- '3.7' -- '3.8' -- '3.9' -- 3.10-dev -- nightly -- pypy3 -install: -- travis_retry pip install coveralls -script: -- coverage run --source=jsonpointer tests.py -after_script: -- coveralls -sudo: false -addons: - apt: - packages: - - pandoc -before_deploy: -- pip install -r requirements-dev.txt -deploy: - provider: pypi - user: skoegl - password: - secure: bKET/1sK+uWetPM3opPTt4qHHfZ6bMcjuLGe3Z/EUfNnGazcbDezy9CHJSqofuMXynF3xc8yluEojjfaqos3Ge/Y4o8pdFMY8ABp8KkxMnAJYGtYzbneSHgdgxPKsmdcUMVtIfioqkeNJTJClWUhRikWSlpKZ7TtkK4AmWtKNwc= - on: - tags: true - distributions: sdist bdist_wheel diff --git a/debian/changelog b/debian/changelog index 5f0607c..dd82f52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-json-pointer (2.4-1) experimental; urgency=medium + + * New upstream release. + + -- Thomas Goirand <zigo@debian.org> Fri, 23 Feb 2024 13:39:15 +0100 + python-json-pointer (2.3-3) unstable; urgency=medium * Cleans better (Closes: #1046832). diff --git a/jsonpointer.py b/jsonpointer.py index b45684d..47d90ad 100644 --- a/jsonpointer.py +++ b/jsonpointer.py @@ -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.3' +__version__ = '2.4' __website__ = 'https://github.com/stefankoegl/python-json-pointer' __license__ = 'Modified BSD License' @@ -10,7 +10,7 @@ help: @echo test: - python tests.py + python -munittest coverage: coverage run --source=jsonpointer tests.py @@ -41,11 +41,11 @@ CLASSIFIERS = [ '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 :: 3.10', + 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Topic :: Software Development :: Libraries', @@ -64,5 +64,5 @@ setup(name=PACKAGE, py_modules=MODULES, scripts=['bin/jsonpointer'], classifiers=CLASSIFIERS, - python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', + python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, !=3.6.*', ) @@ -7,6 +7,7 @@ import doctest import unittest import sys import copy +import jsonpointer from jsonpointer import resolve_pointer, EndOfList, JsonPointerException, \ JsonPointer, set_pointer @@ -410,23 +411,6 @@ class AltTypesTests(unittest.TestCase): self.assertRaises(JsonPointerException, resolve_pointer, doc, '/root/1/2/3/4') - -suite = unittest.TestSuite() -suite.addTest(unittest.makeSuite(SpecificationTests)) -suite.addTest(unittest.makeSuite(ComparisonTests)) -suite.addTest(unittest.makeSuite(WrongInputTests)) -suite.addTest(unittest.makeSuite(ToLastTests)) -suite.addTest(unittest.makeSuite(SetTests)) -suite.addTest(unittest.makeSuite(AltTypesTests)) - -modules = ['jsonpointer'] - -for module in modules: - m = __import__(module, fromlist=[module]) - suite.addTest(doctest.DocTestSuite(m)) - -runner = unittest.TextTestRunner(verbosity=1) -result = runner.run(suite) - -if not result.wasSuccessful(): - sys.exit(1) +def load_tests(loader, tests, ignore): + tests.addTests(doctest.DocTestSuite(jsonpointer)) + return tests |