Merge 9e0810d into 0daa3ad

.pre-commit-config.yaml

@@ -1,35 +1,45 @@
+exclude: |
+    (?x)^(
+        versioneer\.py|
+        kanren/_version\.py|
+        doc/.*|
+        bin/.*
+    )$
 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.1.0
+    hooks:
+      - id: debug-statements
+        exclude: |
+          (?x)^(
+              kanren/core\.py|
+          )$
+      - id: check-merge-conflict
   - repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 22.3.0
     hooks:
       - id: black
         language_version: python3
-        exclude: |
-            (?x)^(
-                versioneer\.py|
-                kanren/_version\.py|
-                doc/.*|
-                bin/.*
-            )$
   - repo: https://gitlab.com/pycqa/flake8
     rev: 3.8.4
     hooks:
       - id: flake8
-        exclude: |
-            (?x)^(
-                versioneer\.py|
-                kanren/_version\.py|
-                doc/.*|
-                bin/.*
-            )$
   - repo: https://github.com/pycqa/isort
-    rev: 5.5.2
+    rev: 5.6.4
     hooks:
       - id: isort
+  - repo: https://github.com/humitos/mirrors-autoflake.git
+    rev: v1.1
+    hooks:
+      - id: autoflake
         exclude: |
-            (?x)^(
-                versioneer\.py|
-                kanren/_version\.py|
-                doc/.*|
-                bin/.*
-            )$
+          (?x)^(
+              .*/?__init__\.py|
+          )$
+        args: ['--in-place', '--remove-all-unused-imports', '--remove-unused-variable']
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v0.931
+    hooks:
+      - id: mypy
+        additional_dependencies:
+        - types-setuptools

examples/commutative.py

@@ -2,6 +2,7 @@
 from kanren.assoccomm import associative, commutative
 from kanren.assoccomm import eq_assoccomm as eq
 
+
 # Define some dummy Operationss
 add = "add"
 mul = "mul"

examples/corleone.py

@@ -7,6 +7,7 @@
 
 from kanren import Relation, conde, facts, run, var
 
+
 father = Relation()
 mother = Relation()
 

examples/states.py

@@ -8,6 +8,7 @@
 """
 from kanren import Relation, fact, run, var
 
+
 adjacent = Relation()
 coastal = Relation()
 

examples/user_classes.py

@@ -5,6 +5,7 @@
 from kanren.core import lall
 from kanren.term import applyo, term  # noqa: F401
 
+
 unifiable(Account)  # Register Account class
 
 accounts = (

examples/zebra-puzzle.py

@@ -2,16 +2,17 @@
 Zebra puzzle as published in Life International in 1962.
 https://en.wikipedia.org/wiki/Zebra_Puzzle
 """
-from typing import Union
 from dataclasses import dataclass, field
+from typing import Union
 
-from kanren import eq, conde, lall, membero, run
-from unification import unifiable, var, vars, Var
+from unification import Var, unifiable, var, vars
+
+from kanren import conde, eq, lall, membero, run
 
 
 @unifiable
 @dataclass
-class House():
+class House:
     nationality: Union[str, Var] = field(default_factory=var)
     drink: Union[str, Var] = field(default_factory=var)
     animal: Union[str, Var] = field(default_factory=var)
@@ -24,6 +25,7 @@ def righto(right, left, houses):
     neighbors = tuple(zip(houses[:-1], houses[1:]))
     return membero((left, right), neighbors)
 
+
 def nexto(a, b, houses):
     """Express that `a` and `b` are next to each other."""
     return conde([righto(a, b, houses)], [righto(b, a, houses)])
@@ -53,8 +55,42 @@ def nexto(a, b, houses):
 
 results = run(0, houses, goals)
 print(results)
-# ([House(nationality='Norwegian', drink='water', animal='fox', cigarettes='Kools', color='yellow'),
-#   House(nationality='Ukrainian', drink='tea', animal='horse', cigarettes='Chesterfields', color='blue'),
-#   House(nationality='Englishman', drink='milk', animal='snails', cigarettes='Old Gold', color='red'),
-#   House(nationality='Spaniard', drink='orange juice', animal='dog', cigarettes='Lucky Strike', color='ivory'),
-#   House(nationality='Japanese', drink='coffee', animal='zebra', cigarettes='Parliaments', color='green')],)
+# (
+#     [
+#         House(
+#             nationality="Norwegian",
+#             drink="water",
+#             animal="fox",
+#             cigarettes="Kools",
+#             color="yellow",
+#         ),
+#         House(
+#             nationality="Ukrainian",
+#             drink="tea",
+#             animal="horse",
+#             cigarettes="Chesterfields",
+#             color="blue",
+#         ),
+#         House(
+#             nationality="Englishman",
+#             drink="milk",
+#             animal="snails",
+#             cigarettes="Old Gold",
+#             color="red",
+#         ),
+#         House(
+#             nationality="Spaniard",
+#             drink="orange juice",
+#             animal="dog",
+#             cigarettes="Lucky Strike",
+#             color="ivory",
+#         ),
+#         House(
+#             nationality="Japanese",
+#             drink="coffee",
+#             animal="zebra",
+#             cigarettes="Parliaments",
+#             color="green",
+#         ),
+#     ],
+# )

kanren/__init__.py

@@ -19,5 +19,6 @@
 )
 from .term import arguments, operator, term, unifiable_with_term
 
+
 __version__ = get_versions()["version"]
 del get_versions

kanren/assoccomm.py

@@ -44,6 +44,7 @@
 from .graph import term_walko
 from .term import term
 
+
 associative = Relation("associative")
 commutative = Relation("commutative")
 

kanren/constraints.py

@@ -2,6 +2,7 @@
 from abc import ABC, abstractmethod
 from collections import UserDict
 from collections.abc import Mapping
+from typing import Optional
 
 from cons.core import ConsPair
 from toolz import groupby
@@ -26,7 +27,7 @@ class ConstraintStore(ABC):
     """
 
     __slots__ = ("lvar_constraints",)
-    op_str = None
+    op_str: Optional[str] = None
 
     def __init__(self, lvar_constraints=None):
         # self.lvar_constraints = weakref.WeakKeyDictionary(lvar_constraints)