[pre-commit.ci] pre-commit autoupdate

.github/workflows/test.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Install enchant
         run: |
           sudo apt-get -qq update
-          sudo apt-get -y install enchant
+          sudo apt-get -y install enchant-2
 
       - name: Install dependencies
         run: |

.pre-commit-config.yaml

@@ -1,22 +1,22 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 22.8.0
+    rev: 23.11.0
     hooks:
       - id: black
         args: ["--target-version", "py37"]
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort
 
   - repo: https://github.com/pre-commit/pygrep-hooks
-    rev: v1.9.0
+    rev: v1.10.0
     hooks:
       - id: python-check-blanket-noqa
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.5.0
     hooks:
       - id: check-merge-conflict
       - id: check-yaml

jsonmodels/errors.py

@@ -1,13 +1,10 @@
 class ValidationError(RuntimeError):
-
     pass
 
 
 class FieldNotFound(RuntimeError):
-
     pass
 
 
 class FieldNotSupported(ValueError):
-
     pass

setup.py

@@ -15,7 +15,6 @@
 
 
 class PyTest(TestCommand):
-
     user_options = [("pytest-args=", "a", "Arguments to pass to py.test")]
 
     def initialize_options(self):

tests/test_circular_references.py

@@ -5,13 +5,11 @@
 
 
 class Primary(models.Base):
-
     name = fields.StringField()
     secondary = fields.EmbeddedField("Secondary")
 
 
 class Secondary(models.Base):
-
     data = fields.IntField()
     first = fields.EmbeddedField("Primary")
 
@@ -24,19 +22,16 @@ def test_generate_circular_schema():
 
 
 class File(models.Base):
-
     name = fields.StringField()
     size = fields.FloatField()
 
 
 class Directory(models.Base):
-
     name = fields.StringField()
     children = fields.ListField(["Directory", File])
 
 
 class Filesystem(models.Base):
-
     name = fields.StringField()
     children = fields.ListField([Directory, File])
 

tests/test_data_initialization.py

@@ -7,7 +7,6 @@
 
 def test_initialization():
     class Person(models.Base):
-
         name = fields.StringField()
         surname = fields.StringField()
         age = fields.IntField()
@@ -38,12 +37,10 @@ class Person(models.Base):
 
 def test_deep_initialization():
     class Car(models.Base):
-
         brand = fields.StringField()
         extra = fields.DictField()
 
     class ParkingPlace(models.Base):
-
         location = fields.StringField()
         car = fields.EmbeddedField(Car)
 
@@ -89,15 +86,12 @@ class ParkingPlace(models.Base):
 
 def test_deep_initialization_error_with_multitypes():
     class Viper(models.Base):
-
         brand = fields.StringField()
 
     class Lamborghini(models.Base):
-
         brand = fields.StringField()
 
     class ParkingPlace(models.Base):
-
         location = fields.StringField()
         car = fields.EmbeddedField([Viper, Lamborghini])
 
@@ -113,11 +107,9 @@ class ParkingPlace(models.Base):
 
 def test_deep_initialization_with_list():
     class Car(models.Base):
-
         brand = fields.StringField()
 
     class Parking(models.Base):
-
         location = fields.StringField()
         cars = fields.ListField(items_types=Car)
 
@@ -156,15 +148,12 @@ class Parking(models.Base):
 
 def test_deep_initialization_error_with_list_and_multitypes():
     class Viper(models.Base):
-
         brand = fields.StringField()
 
     class Lamborghini(models.Base):
-
         brand = fields.StringField()
 
     class Parking(models.Base):
-
         location = fields.StringField()
         cars = fields.ListField([Viper, Lamborghini])
 
@@ -193,15 +182,12 @@ class Parking(models.Base):
 
 def test_deep_initialization_error_when_result_non_iterable():
     class Viper(models.Base):
-
         brand = fields.StringField()
 
     class Lamborghini(models.Base):
-
         brand = fields.StringField()
 
     class Parking(models.Base):
-
         location = fields.StringField()
         cars = fields.ListField([Viper, Lamborghini])
 
@@ -220,7 +206,6 @@ class Parking(models.Base):
 
 def test_initialization_with_non_models_types():
     class Person(models.Base):
-
         names = fields.ListField(str)
         surname = fields.StringField()
 
@@ -239,7 +224,6 @@ class Person(models.Base):
 
 def test_initialization_with_multi_non_models_types():
     class Person(models.Base):
-
         name = fields.StringField()
         mix = fields.ListField((str, float))
 
@@ -259,7 +243,6 @@ class Person(models.Base):
 
 def test_initialization_with_wrong_types():
     class Person(models.Base):
-
         name = fields.StringField()
         mix = fields.ListField((str, float))
 
@@ -270,11 +253,9 @@ class Person(models.Base):
 
 def test_deep_initialization_for_embed_field():
     class Car(models.Base):
-
         brand = fields.StringField()
 
     class ParkingPlace(models.Base):
-
         location = fields.StringField()
         car = fields.EmbeddedField(Car)
 

tests/test_datetime_fields.py

@@ -30,7 +30,6 @@ def dst(self, dt):
 
 def test_time_field():
     class Event(models.Base):
-
         time = fields.TimeField()
 
     event = Event()
@@ -42,7 +41,6 @@ class Event(models.Base):
 
 def test_time_field_not_required():
     class Event(models.Base):
-
         time = fields.TimeField(required=False)
 
     event = Event()
@@ -52,7 +50,6 @@ class Event(models.Base):
 
 
 def test_time_field_to_struct():
-
     field = fields.TimeField()
 
     assert field.str_format is None
@@ -65,7 +62,6 @@ def test_time_field_to_struct():
 
 
 def test_base_field_to_struct():
-
     field = fields.BaseField()
     assert field.to_struct(True) is True
     assert field.to_struct(False) is False
@@ -74,7 +70,6 @@ def test_base_field_to_struct():
 
 
 def test_time_field_to_struct_with_format():
-
     field = fields.TimeField(str_format="%H:%M")
 
     assert "%H:%M" == field.str_format
@@ -87,7 +82,6 @@ def test_time_field_to_struct_with_format():
 
 
 def test_time_field_to_struct_with_tz():
-
     field = fields.TimeField()
 
     tt = datetime.time(tzinfo=_TestCet())
@@ -104,15 +98,13 @@ def test_time_field_to_struct_with_tz():
 
 
 def test_time_field_format_has_precedence():
-
     field = fields.TimeField(str_format="%H:%M")
 
     tt = datetime.time(12, 34, 56, tzinfo=_TestCet())
     assert "12:34" == field.to_struct(tt)
 
 
 def test_time_field_parse_value():
-
     field = fields.TimeField()
 
     assert datetime.time() == field.parse_value("00:00:00")
@@ -126,7 +118,6 @@ def test_time_field_parse_value():
 
 def test_date_field():
     class Event(models.Base):
-
         date = fields.DateField()
 
     event = Event()
@@ -138,7 +129,6 @@ class Event(models.Base):
 
 def test_date_field_not_required():
     class Event(models.Base):
-
         date = fields.DateField(required=False)
 
     event = Event()
@@ -148,7 +138,6 @@ class Event(models.Base):
 
 
 def test_date_field_to_struct():
-
     field = fields.DateField()
 
     assert field.str_format is None
@@ -161,7 +150,6 @@ def test_date_field_to_struct():
 
 
 def test_date_field_to_struct_with_format():
-
     field = fields.DateField(str_format="%Y/%m/%d")
 
     assert "%Y/%m/%d" == field.str_format
@@ -171,7 +159,6 @@ def test_date_field_to_struct_with_format():
 
 
 def test_date_field_parse_value():
-
     field = fields.DateField()
 
     assert datetime.date(2012, 12, 21) == field.parse_value("2012-12-21")
@@ -183,7 +170,6 @@ def test_date_field_parse_value():
 
 def test_datetime_field():
     class Event(models.Base):
-
         date = fields.DateTimeField()
 
     event = Event()
@@ -195,7 +181,6 @@ class Event(models.Base):
 
 def test_datetime_field_not_required():
     class Event(models.Base):
-
         date = fields.DateTimeField()
 
     event = Event()
@@ -204,7 +189,6 @@ class Event(models.Base):
 
 
 def test_datetime_field_to_struct():
-
     field = fields.DateTimeField()
 
     assert field.str_format is None
@@ -214,7 +198,6 @@ def test_datetime_field_to_struct():
 
 
 def test_datetime_field_to_struct_with_format():
-
     field = fields.TimeField(str_format="%H:%M %Y/%m")
 
     assert "%H:%M %Y/%m" == field.str_format
@@ -224,7 +207,6 @@ def test_datetime_field_to_struct_with_format():
 
 
 def test_datetime_field_to_struct_with_tz():
-
     field = fields.DateTimeField()
 
     tt = datetime.datetime(2014, 5, 7, 12, 45, 56, tzinfo=_TestCet())
@@ -235,15 +217,13 @@ def test_datetime_field_to_struct_with_tz():
 
 
 def test_datetime_field_format_has_precedence():
-
     field = fields.DateTimeField(str_format="%H:%M %Y/%m")
 
     tt = datetime.datetime(2014, 5, 7, 12, 45, 56, tzinfo=_TestCet())
     assert "12:45 2014/05" == field.to_struct(tt)
 
 
 def test_datetime_field_parse_value():
-
     field = fields.DateTimeField()
 
     assert datetime.datetime(2014, 4, 21, 12, 45, 56) == field.parse_value(

tests/test_fields.py

@@ -2,11 +2,9 @@
 
 
 def test_bool_field():
-
     field = fields.BoolField()
 
     class Person(models.Base):
-
         is_programmer = field
 
     person = Person()
@@ -31,15 +29,13 @@ class Person(models.Base):
 
 
 def test_dict_field():
-
     field = fields.DictField()
     default_field = fields.DictField(
         default={"extra_default": "Hello", "deep_extra": {"spanish": "Hola"}},
         validators=[validators.Length(2)],
     )
 
     class Person(models.Base):
-
         extra = field
         extra_required = fields.DictField(required=True)
         extra_default = default_field