cleanup

Author: lucascolley

codecov.yml

@@ -1,4 +1,4 @@
 comment: false
 ignore:
-  - "src/array_api_extra/_compat"
-  - "src/array_api_extra/_typing"
+  - "src/array_api_extra/_lib/_compat"
+  - "src/array_api_extra/_lib/_typing"

pixi.lock

@@ -81,16 +81,14 @@ numpy = "*"
 pytest = "*"
 
 [tool.pixi.feature.lint.pypi-dependencies]
-# basedpyright = "*"
-pyright = "*"
+basedpyright = "*"
 
 [tool.pixi.feature.lint.tasks]
 pre-commit-install = { cmd = "pre-commit install" }
 pre-commit = { cmd = "pre-commit run -v --all-files --show-diff-on-failure" }
 mypy = { cmd = "mypy", cwd = "." }
 pylint = { cmd = ["pylint", "array_api_extra"], cwd = "src" }
-# pyright = { cmd = "basedpyright", cwd = "." }
-pyright = { cmd = "pyright", cwd = "." }
+pyright = { cmd = "basedpyright", cwd = "." }
 lint = { depends-on = ["pre-commit", "pylint", "mypy", "pyright"] }
 
 [tool.pixi.feature.tests.dependencies]
@@ -185,25 +183,17 @@ disallow_incomplete_defs = true
 
 # pyright
 
-# [tool.basedpyright]
-# include = ["src", "tests"]
-# pythonVersion = "3.10"
-# pythonPlatform = "All"
-# typeCheckingMode = "all"
-
-# # data-apis/array-api#589
-# reportAny = false
-# reportExplicitAny = false
-# # data-apis/array-api-strict#6
-# reportUnknownMemberType = false
-
-[tool.pyright]
+[tool.basedpyright]
 include = ["src", "tests"]
 pythonVersion = "3.10"
 pythonPlatform = "All"
-typeCheckingMode = "strict"
+typeCheckingMode = "all"
+
+# data-apis/array-api#589
+reportAny = false
+reportExplicitAny = false
+# data-apis/array-api-strict#6
 reportUnknownMemberType = false
-reportImportCycles = true
 
 
 # Ruff

pyproject.toml

@@ -4,7 +4,7 @@
 import warnings
 
 if typing.TYPE_CHECKING:
-    from ._typing import Array, ModuleType
+    from ._lib._typing import Array, ModuleType
 
 from ._lib import _utils
 

src/array_api_extra/_funcs.py

@@ -9,7 +9,7 @@
 from typing_extensions import override
 
 if typing.TYPE_CHECKING:
-    from .._typing import Array, Device
+    from ._typing import Array, Device
 
 __all__ = ["device"]
 

src/array_api_extra/_lib/_compat.py

@@ -3,7 +3,7 @@
 import typing
 
 if typing.TYPE_CHECKING:
-    from .._typing import Array, ModuleType
+    from ._typing import Array, ModuleType
 
 from . import _compat
 

src/array_api_extra/_typing.py renamed to src/array_api_extra/_lib/_typing.py

@@ -13,7 +13,7 @@
 from array_api_extra import atleast_nd, cov, create_diagonal, expand_dims, kron, sinc
 
 if typing.TYPE_CHECKING:
-    from array_api_extra._typing import Array
+    from array_api_extra._lib._typing import Array
 
 
 class TestAtLeastND: