chore: Update pre-commit

Author: Stranger6667

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
 
       - uses: actions/setup-python@v3
         with:
-          python-version: 3.7
+          python-version: 3.9
 
       - run: pip install pre-commit
       - run: SKIP=mypy pre-commit run --all-files
@@ -40,7 +40,7 @@ jobs:
 
       - uses: actions/setup-python@v3
         with:
-          python-version: 3.7
+          python-version: 3.9
 
       - run: pip install pre-commit
       - run: pre-commit run mypy --all-files

.pre-commit-config.yaml

@@ -1,14 +1,14 @@
 default_language_version:
-  python: python3.7
+  python: python3.9
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer
       - id: trailing-whitespace
-        exclude: ^.*\.(md|rst)$
+        exclude: ^.*\.md$
       - id: debug-statements
       - id: mixed-line-ending
         args: [--fix=lf]
@@ -20,41 +20,23 @@ repos:
       - id: gitlint
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.30.0
+    rev: v1.33.0
     hooks:
       - id: yamllint
 
-  - repo: https://github.com/ambv/black
-    rev: 23.3.0
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.7.1
     hooks:
-      - id: black
-        types: [python]
+      - id: mypy
+        exclude: ^(docs/|test/).*$
+        args: ["--ignore-missing-imports"]
 
-  - repo: https://github.com/asottile/blacken-docs
-    rev: 1.13.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.1.6
     hooks:
-      - id: blacken-docs
-        additional_dependencies: [ black==23.3.0 ]
+      - id: ruff-format
 
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.0.261"
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.1.6
     hooks:
       - id: ruff
-
-  - repo: https://github.com/asottile/seed-isort-config
-    rev: v2.2.0
-    hooks:
-      - id: seed-isort-config
-
-  - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v5.10.1
-    hooks:
-      - id: isort
-        additional_dependencies: ["isort[pyproject]"]
-
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.2.0
-    hooks:
-      - id: mypy
-        exclude: ^(docs/|test/).*$
-        args: ["--ignore-missing-imports"]

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at dadygalo@gmail.com. All
+reported by contacting the project team at dmitry@dygalo.dev. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

CONTRIBUTING.md

@@ -27,7 +27,7 @@ the problem.
 
 3.  Target the `master` branch.
 
-4.  Follow **PEP-8** for naming and [black](https://github.com/psf/black) for formatting.
+4.  Follow [PEP-8](https://pep8.org) for naming and [ruff](https://github.com/astral-sh/ruff) for code formatting.
 
 5.  Tests are run using `tox`:
 

pyproject.toml

@@ -24,8 +24,8 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Software Development :: Testing",
 ]
-authors = [{ name = "Dmitry Dygalo", email = "dadygalo@gmail.com" }]
-maintainers = [{ name = "Dmitry Dygalo", email = "dadygalo@gmail.com" }]
+authors = [{ name = "Dmitry Dygalo", email = "dmitry@dygalo.dev" }]
+maintainers = [{ name = "Dmitry Dygalo", email = "dmitry@dygalo.dev" }]
 readme = "README.md"
 license = "MIT"
 include = ["src/hypothesis_graphql/py.typed"]
@@ -53,18 +53,6 @@ Changelog = "https://github.com/Stranger6667/hypothesis-graphql/blob/master/CHAN
 Funding = "https://github.com/sponsors/Stranger6667"
 "Source Code" = "https://github.com/Stranger6667/hypothesis-graphql"
 
-[tool.black]
-line-length = 120
-target_version = ["py37"]
-
-[tool.isort]
-line_length = 120
-multi_line_output = 3
-default_section = "THIRDPARTY"
-include_trailing_comma = true
-known_first_party = "hypothesis_graphql"
-known_third_party =["graphql", "hypothesis", "hypothesis_graphql", "pytest"]
-
 [tool.coverage.run]
 parallel = true
 branch = true
@@ -84,6 +72,7 @@ exclude_lines = [
 ]
 
 [tool.ruff]
+line-length = 120
 select = [
     "E",  # pycodestyle errors
     "W",  # pycodestyle warnings
@@ -93,7 +82,7 @@ select = [
     "D",  # pydocstyle
 ]
 ignore = [
-    "E501",  # Line too long, handled by black
+    "E501",  # Line too long
     "B008",  # Do not perform function calls in argument defaults
     "C901",  # Too complex
     "D100",  # Missing docstring in public module
@@ -113,3 +102,10 @@ target-version = "py37"
 [tool.ruff.per-file-ignores]
 "__init__.py" = ["F401"]
 "strategies.py" = ["F401"]
+
+[tool.ruff.format]
+skip-magic-trailing-comma = false
+
+[tool.ruff.isort]
+known-first-party = ["hypothesis_graphql"]
+known-third-party = ["graphql", "hypothesis", "pytest"]

src/hypothesis_graphql/_strategies/aliases.py

@@ -20,7 +20,9 @@ def maybe_add_alias_to_node(node: graphql.SelectionNode, seen: Dict[Tuple[str, s
 
 
 def maybe_add_alias(
-    field_node: graphql.FieldNode, arguments: List[graphql.ArgumentNode], seen: Dict[Tuple[str, str], List]
+    field_node: graphql.FieldNode,
+    arguments: List[graphql.ArgumentNode],
+    seen: Dict[Tuple[str, str], List],
 ) -> None:
     for argument in arguments:
         key = (field_node.name.value, argument.name.value)

src/hypothesis_graphql/_strategies/primitives.py

@@ -86,7 +86,9 @@ def maybe_null(strategy: st.SearchStrategy[T], nullable: bool) -> st.SearchStrat
 
 
 def custom(
-    strategy: st.SearchStrategy, nullable: bool = True, default: Optional[graphql.ValueNode] = None
+    strategy: st.SearchStrategy,
+    nullable: bool = True,
+    default: Optional[graphql.ValueNode] = None,
 ) -> st.SearchStrategy:
     return maybe_default(maybe_null(strategy, nullable), default=default)
 
@@ -101,7 +103,9 @@ def maybe_default(
 
 @lru_cache(maxsize=64)
 def enum(
-    values: Tuple[str], nullable: bool = True, default: Optional[graphql.ValueNode] = None
+    values: Tuple[str],
+    nullable: bool = True,
+    default: Optional[graphql.ValueNode] = None,
 ) -> st.SearchStrategy[graphql.EnumValueNode]:
     return maybe_default(maybe_null(st.sampled_from(values).map(nodes.Enum), nullable), default=default)
 

src/hypothesis_graphql/_strategies/strategy.py

@@ -12,7 +12,14 @@
 from hypothesis.strategies._internal.utils import cacheable
 
 from .. import nodes
-from ..types import AstPrinter, CustomScalarStrategies, Field, InputTypeNode, InterfaceOrObject, SelectionNodes
+from ..types import (
+    AstPrinter,
+    CustomScalarStrategies,
+    Field,
+    InputTypeNode,
+    InterfaceOrObject,
+    SelectionNodes,
+)
 from . import factories, primitives, validation
 from .ast import make_mutation, make_query
 from .containers import flatten
@@ -51,7 +58,9 @@ class GraphQLStrategy:
     _cache: Dict[str, Dict] = dataclasses.field(default_factory=dict)
 
     def values(
-        self, type_: graphql.GraphQLInputType, default: Optional[graphql.ValueNode] = None
+        self,
+        type_: graphql.GraphQLInputType,
+        default: Optional[graphql.ValueNode] = None,
     ) -> st.SearchStrategy[InputTypeNode]:
         """Generate value nodes of a type, that corresponds to the input type.
 
@@ -81,9 +90,18 @@ def values(
             return self.objects(type_, nullable)
         raise TypeError(f"Type {type_.__class__.__name__} is not supported.")
 
-    @instance_cache(lambda type_, nullable=True, default=None: (make_type_name(type_), nullable, default))
+    @instance_cache(
+        lambda type_, nullable=True, default=None: (
+            make_type_name(type_),
+            nullable,
+            default,
+        )
+    )
     def lists(
-        self, type_: graphql.GraphQLList, nullable: bool = True, default: Optional[graphql.ValueNode] = None
+        self,
+        type_: graphql.GraphQLList,
+        nullable: bool = True,
+        default: Optional[graphql.ValueNode] = None,
     ) -> st.SearchStrategy[graphql.ListValueNode]:
         """Generate a `graphql.ListValueNode`."""
         strategy = st.lists(self.values(type_.of_type))
@@ -121,16 +139,24 @@ def lists_of_object_fields(
     ) -> st.SearchStrategy[List[graphql.ObjectFieldNode]]:
         return st.tuples(
             *(
-                self.values(field.type, field.ast_node.default_value if field.ast_node is not None else None).map(
-                    factories.object_field(name)
-                )
+                self.values(
+                    field.type,
+                    field.ast_node.default_value if field.ast_node is not None else None,
+                ).map(factories.object_field(name))
                 for name, field in items
             )
         ).map(list)
 
-    @instance_cache(lambda interface, implementations: (interface.name, tuple(impl.name for impl in implementations)))
+    @instance_cache(
+        lambda interface, implementations: (
+            interface.name,
+            tuple(impl.name for impl in implementations),
+        )
+    )
     def interfaces(
-        self, interface: graphql.GraphQLInterfaceType, implementations: List[InterfaceOrObject]
+        self,
+        interface: graphql.GraphQLInterfaceType,
+        implementations: List[InterfaceOrObject],
     ) -> st.SearchStrategy[SelectionNodes]:
         """Build query for GraphQL interface type."""
         # If there are implementations that have fields with the same name but different types
@@ -376,7 +402,12 @@ def queries(
     if parsed_schema.query_type is None:
         raise InvalidArgument("Query type is not defined in the schema")
     return (
-        _make_strategy(parsed_schema, type_=parsed_schema.query_type, fields=fields, custom_scalars=custom_scalars)
+        _make_strategy(
+            parsed_schema,
+            type_=parsed_schema.query_type,
+            fields=fields,
+            custom_scalars=custom_scalars,
+        )
         .map(make_query)
         .map(print_ast)
     )
@@ -403,7 +434,12 @@ def mutations(
     if parsed_schema.mutation_type is None:
         raise InvalidArgument("Mutation type is not defined in the schema")
     return (
-        _make_strategy(parsed_schema, type_=parsed_schema.mutation_type, fields=fields, custom_scalars=custom_scalars)
+        _make_strategy(
+            parsed_schema,
+            type_=parsed_schema.mutation_type,
+            fields=fields,
+            custom_scalars=custom_scalars,
+        )
         .map(make_mutation)
         .map(print_ast)
     )

src/hypothesis_graphql/nodes.py

@@ -8,13 +8,15 @@
 
 
 def String(
-    value: typing.Any, StringValueNode: typing.Type[graphql.StringValueNode] = graphql.StringValueNode
+    value: typing.Any,
+    StringValueNode: typing.Type[graphql.StringValueNode] = graphql.StringValueNode,
 ) -> graphql.StringValueNode:
     return StringValueNode(value=str(value))
 
 
 def Float(
-    value: float, FloatValueNode: typing.Type[graphql.FloatValueNode] = graphql.FloatValueNode
+    value: float,
+    FloatValueNode: typing.Type[graphql.FloatValueNode] = graphql.FloatValueNode,
 ) -> graphql.FloatValueNode:
     return FloatValueNode(value=str(value))
 
@@ -31,7 +33,8 @@ def Object(
 
 
 def List(
-    values: typing.List[graphql.ValueNode], ListValueNode: typing.Type[graphql.ListValueNode] = graphql.ListValueNode
+    values: typing.List[graphql.ValueNode],
+    ListValueNode: typing.Type[graphql.ListValueNode] = graphql.ListValueNode,
 ) -> graphql.ListValueNode:
     return ListValueNode(values=values)
 

src/hypothesis_graphql/types.py

@@ -4,8 +4,18 @@
 from hypothesis import strategies as st
 
 # Leaf nodes, that don't have children
-ScalarValueNode = Union[graphql.IntValueNode, graphql.FloatValueNode, graphql.StringValueNode, graphql.BooleanValueNode]
-InputTypeNode = Union[ScalarValueNode, graphql.EnumValueNode, graphql.ListValueNode, graphql.ObjectValueNode]
+ScalarValueNode = Union[
+    graphql.IntValueNode,
+    graphql.FloatValueNode,
+    graphql.StringValueNode,
+    graphql.BooleanValueNode,
+]
+InputTypeNode = Union[
+    ScalarValueNode,
+    graphql.EnumValueNode,
+    graphql.ListValueNode,
+    graphql.ObjectValueNode,
+]
 Field = Union[graphql.GraphQLField, graphql.GraphQLInputField]
 InterfaceOrObject = Union[graphql.GraphQLObjectType, graphql.GraphQLInterfaceType]
 SelectionNodes = List[graphql.SelectionNode]