use stubs dir, mypy still failing

Quantco · May 23, 2024 · 825a7a1 · 825a7a1
1 parent 5ea5920
commit 825a7a1
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/src/multiregex/__init__.py → multiregex/__init__.py b/src/multiregex/__init__.py → multiregex/__init__.py
diff --git a/src/multiregex/py.typed → multiregex/py.typed b/src/multiregex/py.typed → multiregex/py.typed
diff --git a/pyproject.toml b/pyproject.toml
@@ -32,11 +32,8 @@ dynamic = ["version"]
 [project.urls]
 Home = "https://github.com/quantco/multiregex"
 
-[tool.setuptools]
-package-dir = { "" = "src" }
-
 [tool.setuptools.packages.find]
-include = ["src/multiregex"]
+include = ["multiregex"]
 namespaces = false
 
 [tool.isort]
@@ -49,10 +46,13 @@ skip_glob = '\.eggs/*,\.git/*,\.venv/*,build/*,dist/*'
 default_section = 'THIRDPARTY'
 
 [tool.mypy]
+mypy_path = "stubs"
 python_version = "3.8"
 no_implicit_optional = true
 check_untyped_defs = true
 allow_redefinition = true
+explicit_package_bases = true
+exclude = ["docs/"]
 
 [tool.ruff]
 line-length = 88

diff --git a/src/ahocorasick.pyi → stubs/ahocorasick.pyi b/src/ahocorasick.pyi → stubs/ahocorasick.pyi
diff --git a/tests/test_bench.py b/tests/test_bench.py
@@ -3,7 +3,6 @@
 from pathlib import Path
 
 from multiregex import RegexMatcher
-
 from test_utils import assert_matches_equal
 
 # Simplistic Python parser
@@ -33,7 +32,7 @@ def test_python_parser():
 
 
 def test_parse_myself():
-    myself = Path(__file__).parents[1] / "src" / "multiregex" / "__init__.py"
+    myself = Path(__file__).parents[1] / "multiregex" / "__init__.py"
     with myself.open() as f:
         myself_src = f.read().splitlines()
     slow_matcher = make_slow_matcher(python_parser.values())

diff --git a/tests/test_multiregex.py b/tests/test_multiregex.py
@@ -2,8 +2,8 @@
 import re
 
 import pytest
-from multiregex import AhocorasickError, RegexMatcher, generate_prematchers
 
+from multiregex import AhocorasickError, RegexMatcher, generate_prematchers
 from test_utils import assert_matches_equal