Change project layout

.gitignore

@@ -1,7 +1,11 @@
+# Caches
 __pycache__/
 /*cache/
-docs/_build/
-activate.sh
 
-# IDEs
+# Build artifacts
+/dist/
+/docs/_build/
+
+# IDEs and dev files
+activate.sh
 .vscode/

pyproject.toml

@@ -44,6 +44,14 @@ sphinx-issues = "^1.2.0"
 numpydoc = "^1.1.0"
 matplotlib = "^3.3.3"
 
+[tool.pytest.ini_options]
+addopts = [
+    "--import-mode=importlib",
+]
+# Flaky tests should be marked as xfail(strict=False),
+# this will notify us when a test considered broken starts succeeding.
+xfail_strict = true
+
 [tool.ruff]
 # TODO: remove `target-version` when switching to PEP 621
 target-version = "py39"
@@ -63,6 +71,8 @@ ignore = [
 ]
 [tool.ruff.per-file-ignores]
 "examples/*.py" = ["E402"]
+[tool.ruff.isort]
+known-first-party = ["sklearn_ann"]
 
 [build-system]
 requires = ["setuptools", "poetry-core>=1.0.0"]

sklearn_ann/kneighbors/tests/utils.py → src/sklearn_ann/test_utils.py

@@ -1,8 +1,6 @@
 from enum import Enum
 from importlib.util import find_spec
 
-import pytest
-
 
 def assert_row_close(sp_mat, actual_pdist, row=42, thresh=0.01):
     row_mat = sp_mat.getrow(row)
@@ -30,6 +28,8 @@ class needs(Enum):
     pynndescent = ("pynndescent",)
 
     def __call__(self, fn=None):
+        import pytest
+
         what = (
             f"package {self.value[0]}"
             if len(self.value) == 1

sklearn_ann/kneighbors/tests/test_annoy.py → tests/test_annoy.py

@@ -1,10 +1,10 @@
 import numpy as np
 import pytest
 
-from .utils import assert_row_close, needs
+from sklearn_ann.test_utils import assert_row_close, needs
 
 try:
-    from ..annoy import AnnoyTransformer
+    from sklearn_ann.kneighbors.annoy import AnnoyTransformer
 except ImportError:
     pass
 

sklearn_ann/kneighbors/tests/test_common.py → tests/test_common.py

@@ -2,7 +2,7 @@
 import pytest
 from sklearn.utils.estimator_checks import check_estimator
 
-from .utils import needs
+from sklearn_ann.test_utils import needs
 
 try:
     from sklearn_ann.kneighbors.annoy import AnnoyTransformer
@@ -70,6 +70,7 @@ def test_all_estimators(Estimator):
 
 
 def mark_diagonal_0_xfail(est):
+    """Mark flaky tests as xfail(strict=False)."""
     # Should probably postprocess these...
     reasons = {
         PyNNDescentTransformer: "sometimes doesn't return diagonal==0",
@@ -78,7 +79,7 @@ def mark_diagonal_0_xfail(est):
     [val] = est.values
     name = val.__name__ if isinstance(val, type) else val
     if reason := reasons.get(val):
-        return add_mark(est, pytest.mark.xfail(reason=f"{name} {reason}"))
+        return add_mark(est, pytest.mark.xfail(reason=f"{name} {reason}", strict=False))
     return est
 
 

sklearn_ann/kneighbors/tests/test_faiss.py → tests/test_faiss.py

@@ -1,7 +1,7 @@
-from .utils import assert_row_close, needs
+from sklearn_ann.test_utils import assert_row_close, needs
 
 try:
-    from ..faiss import FAISSTransformer
+    from sklearn_ann.kneighbors.faiss import FAISSTransformer
 except ImportError:
     pass
 

sklearn_ann/kneighbors/tests/test_nmslib.py → tests/test_nmslib.py

@@ -1,7 +1,7 @@
-from .utils import assert_row_close, needs
+from sklearn_ann.test_utils import assert_row_close, needs
 
 try:
-    from ..nmslib import NMSlibTransformer
+    from sklearn_ann.kneighbors.nmslib import NMSlibTransformer
 except ImportError:
     pass