Fix merge conflicts

Author: grst

.github/workflows/test.yaml

@@ -26,8 +26,13 @@ jobs:
           - os: ubuntu-latest
             python: "3.10"
           - os: ubuntu-latest
-            python: "3.10"
+            python: "3.11"
+          - os: ubuntu-latest
+            python: "3.11"
             pip-flags: "--pre"
+            name: PRE-RELEASE DEPENDENCIES
+
+    name: ${{ matrix.name }} Python ${{ matrix.python }}
 
     env:
       OS: ${{ matrix.os }}

.github/workflows/test.yaml.rej

@@ -26,5 +26,6 @@ __pycache__/
 # IDEs
 /.idea/
 /.vscode/
+*.code-workspace
 
 /node_modules

.gitignore

@@ -15,7 +15,9 @@ repos:
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix, --unsafe-fixes]
+        types_or: [python, pyi, jupyter]
       - id: ruff-format
+        types_or: [python, pyi, jupyter]
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
@@ -26,6 +28,8 @@ repos:
         args: [--fix=lf]
       - id: trailing-whitespace
       - id: check-case-conflict
+      - id: check-merge-conflict
+        args: [--assume-in-merge]
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.8.0
     hooks:

.pre-commit-config.yaml

@@ -120,17 +120,7 @@
 
 pygments_style = "default"
 
-
-def setup(app):
-    """App setup hook."""
-    app.add_config_value(
-        "recommonmark_config",
-        {
-            "auto_toc_tree_section": "Contents",
-            "enable_auto_toc_tree": True,
-            "enable_math": True,
-            "enable_inline_math": False,
-            "enable_eval_rst": True,
-        },
-        True,
-    )
+nitpick_ignore: list[tuple[str, str]] = [
+    # you can add an exception to this list.
+    #     ("py:class", "igraph.Graph"),
+]

.pre-commit-config.yaml.rej

@@ -0,0 +1,11 @@
+{
+    "folders": [
+        {
+            "path": ".",
+        },
+        {
+            "path": "../formulaic",
+        },
+    ],
+    "settings": {},
+}

README.md.rej

@@ -70,6 +70,12 @@ addopts = [
 [tool.ruff]
 src = ["src"]
 line-length = 120
+extend-include = ["*.ipynb"]
+
+[tool.ruff.format]
+docstring-code-format = true
+
+[tool.ruff.lint]
 select = [
     "F",  # Errors detected by Pyflakes
     "E",  # Error detected by Pycodestyle
@@ -112,10 +118,10 @@ ignore = [
     "B018"
 ]
 
-[tool.ruff.pydocstyle]
+[tool.ruff.lint.pydocstyle]
 convention = "numpy"
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "docs/*" = ["I"]
 "tests/*" = ["D"]
 "*/__init__.py" = ["F401"]