Merge branch 'master' of github.com:jazzband/jsonmodels into add/pyproject

beregond · beregond · commit 6b07409317aa · 2025-12-27T22:45:48.000+01:00
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -11,4 +11,4 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: "3.x"
-      - uses: pre-commit/action@v2.0.3
+      - uses: pre-commit/action@v3.0.1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,9 +6,9 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
-      max-parallel: 7
+      max-parallel: 5
       matrix:
-        python-version: ["pypy-3.9", "pypy-3.10", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,12 +1,12 @@
 repos:
-  - repo: https://github.com/psf/black
-    rev: 23.11.0
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 25.9.0
     hooks:
       - id: black
         args: ["--target-version", "py37"]
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 6.1.0
     hooks:
       - id: isort
 
@@ -16,7 +16,7 @@ repos:
       - id: python-check-blanket-noqa
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v6.0.0
     hooks:
       - id: check-merge-conflict
       - id: check-yaml
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -84,12 +84,9 @@ Ready to contribute? Here's how to set up `jsonmodels` for local development.
 
    Now you can make your changes locally.
 
-5. When you're done making changes, check that your changes pass the tests, including testing other Python versions with tox::
+5. When you're done making changes, check that your changes pass the tests:
 
     $ pytest
-    $ tox
-
-   To get tox, just pip install them into your virtualenv.
 
 6. Commit your changes and push your branch to GitHub::
 
diff --git a/Makefile b/Makefile
@@ -5,7 +5,6 @@ help:
 	@echo "clean-pyc - remove Python file artifacts"
 	@echo "lint - check style with flake8"
 	@echo "test - run tests quickly with the default Python"
-	@echo "test-all - run tests on every Python version with tox"
 	@echo "coverage - check code coverage quickly with the default Python"
 	@echo "docs - generate Sphinx HTML documentation, including API docs"
 	@echo "release - package and upload a release"
@@ -30,9 +29,6 @@ lint:
 test:
 	python setup.py test
 
-test-all:
-	tox
-
 coverage:
 	python setup.py test
 	coverage html
diff --git a/history/1765305359937317-2681eb1 b/history/1765305359937317-2681eb1
@@ -0,0 +1 @@
+Removed support for PyPy.
diff --git a/history/1765305379256114-8cc7bb9 b/history/1765305379256114-8cc7bb9
@@ -0,0 +1 @@
+Removed support for Python 3.8 and 3.9.
diff --git a/history/1765305394331882-c0e0955 b/history/1765305394331882-c0e0955
@@ -0,0 +1 @@
+Added support for Python 3.13 and 3.14.
diff --git a/jsonmodels/builders.py b/jsonmodels/builders.py
@@ -1,6 +1,5 @@
 """Builders to generate in memory representation of model and fields tree."""
 
-
 from collections import defaultdict
 
 from . import errors
diff --git a/jsonmodels/collections.py b/jsonmodels/collections.py
@@ -1,5 +1,4 @@
 class ModelCollection(list):
-
     """`ModelCollection` is list which validates stored values.
 
     Validation is made with use of field passed to `__init__` at each point,
diff --git a/jsonmodels/fields.py b/jsonmodels/fields.py
@@ -13,7 +13,6 @@
 
 
 class BaseField:
-
     """Base class for all fields."""
 
     types = None
@@ -142,14 +141,12 @@ def structue_name(self, default):
 
 
 class StringField(BaseField):
-
     """String field."""
 
     types = (str,)
 
 
 class IntField(BaseField):
-
     """Integer field."""
 
     types = (int,)
@@ -163,14 +160,12 @@ def parse_value(self, value):
 
 
 class FloatField(BaseField):
-
     """Float field."""
 
     types = (float, int)
 
 
 class BoolField(BaseField):
-
     """Bool field."""
 
     types = (bool,)
@@ -182,14 +177,12 @@ def parse_value(self, value):
 
 
 class DictField(BaseField):
-
     """Dict field."""
 
     types = (dict,)
 
 
 class ListField(BaseField):
-
     """List field."""
 
     types = (list,)
@@ -300,7 +293,6 @@ def to_struct(self, values):
 
 
 class EmbeddedField(BaseField):
-
     """Field for embedded models."""
 
     def __init__(self, model_types, *args, **kwargs):
@@ -403,7 +395,6 @@ def _import(module_name, type_name):
 
 
 class TimeField(StringField):
-
     """Time field."""
 
     types = (datetime.time,)
@@ -434,7 +425,6 @@ def parse_value(self, value):
 
 
 class DateField(StringField):
-
     """Date field."""
 
     types = (datetime.date,)
@@ -466,7 +456,6 @@ def parse_value(self, value):
 
 
 class DateTimeField(StringField):
-
     """Datetime field."""
 
     types = (datetime.datetime,)
diff --git a/jsonmodels/models.py b/jsonmodels/models.py
@@ -24,7 +24,6 @@ def validate_fields(attributes):
 
 
 class Base(metaclass=JsonmodelMeta):
-
     """Base class for all models."""
 
     def __init__(self, **kwargs):
diff --git a/jsonmodels/parsers.py b/jsonmodels/parsers.py
@@ -1,4 +1,5 @@
 """Parsers to change model structure into different ones."""
+
 import inspect
 
 from . import builders, errors, fields
diff --git a/jsonmodels/utilities.py b/jsonmodels/utilities.py
@@ -1,5 +1,4 @@
 import re
-import sre_constants
 from collections import namedtuple
 
 SCALAR_TYPES = tuple(list((str,)) + [int, float, bool])
@@ -97,10 +96,10 @@ def is_ecma_regex(regex):
 
     try:
         re.compile(regex)
-    except sre_constants.error as err:
+    except re.error as err:
         raise ValueError(
             f"Given regex {regex} isn't ECMA regex nor Python regex: {err}."
-        )
+        ) from err
     return False
 
 
diff --git a/jsonmodels/validators.py b/jsonmodels/validators.py
@@ -1,4 +1,5 @@
 """Predefined validators."""
+
 import re
 from functools import reduce
 
@@ -7,7 +8,6 @@
 
 
 class Min:
-
     """Validator for minimum value."""
 
     def __init__(self, minimum_value, exclusive=False):
@@ -41,7 +41,6 @@ def modify_schema(self, field_schema):
 
 
 class Max:
-
     """Validator for maximum value."""
 
     def __init__(self, maximum_value, exclusive=False):
@@ -75,7 +74,6 @@ def modify_schema(self, field_schema):
 
 
 class Regex:
-
     """Validator for regular expressions."""
 
     FLAGS = {
@@ -134,7 +132,6 @@ def modify_schema(self, field_schema):
 
 
 class Length:
-
     """Validator for length."""
 
     def __init__(self, minimum_value=None, maximum_value=None):
@@ -186,7 +183,6 @@ def modify_schema(self, field_schema):
 
 
 class Enum:
-
     """Validator for enums."""
 
     def __init__(self, *choices):
diff --git a/tests/test_project.py b/tests/test_project.py
@@ -26,7 +26,7 @@ def test_pep8_and_complexity():
     not tests.LINT or not tests.CHECK_SPELLING, reason="No spelling check."
 )
 def test_docs():
-    run("sphinx-build -b spelling -d docs/_build/doctress " "docs docs/build/spelling")
+    run("sphinx-build -b spelling -d docs/_build/doctress docs docs/build/spelling")
 
 
 def _collect_static(dirs):
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Removed support for Python 3.8 and 3.9.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Added support for Python 3.13 and 3.14.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`class ModelCollection(list):`
`2`		`-`
`3`	`2`	"""`ModelCollection` is list which validates stored values.
`4`	`3`
`5`	`4`	Validation is made with use of field passed to `__init__` at each point,