Merge pull request #458 from numpy/in-package-test-dirs

🚚 move the tests to within the individual package dirs as `@test`

Author: jorenham

pyproject.toml

@@ -95,27 +95,23 @@ dev = [
 
 
 [tool.hatch.build]
-packages = ["src/_numtype", "src/numtype", "src/numpy-stubs"]
-
-    [tool.hatch.build.targets.sdist]
-    exclude = [
-        "/.github",
-        "/.vscode",
-        "/dist",
-        "/doc",
-        "/test",
-        "/tool",
-        ".mypyignore",
-        ".mypyignore-todo",
-        "CONTRIBUTING.md",
-        "uv.lock",
-    ]
+exclude = [
+    "**/@test",
+    "**/*.yml",
+    "**/.*",
+    "/docs",
+    "/tool",
+    "CONTRIBUTING.md",
+    "uv.lock",
+]
+skip-excluded-dirs = true
+
+    [tool.hatch.build.targets.wheel]
+    packages = ["src/_numtype", "src/numtype", "src/numpy-stubs"]
 
 
 [tool.mypy]
 mypy_path = "src"
-explicit_package_bases = true
-
 strict = true
 strict_bytes = true
 strict_concatenate = true
@@ -137,11 +133,9 @@ disable_memoryview_promotion = true
 
 
 [tool.pyright]
-include = ["src", "test", "tool"]
+include = ["src", "tool"]
 ignore = [".venv"]
 stubPath = "src"
-venvPath = "."
-venv = ".venv"
 pythonPlatform = "All"
 typeCheckingMode = "strict"
 
@@ -152,7 +146,7 @@ enableReachabilityAnalysis = false
 reportCallInDefaultInitializer = true
 reportImportCycles = true
 reportImplicitOverride = true
-reportInvalidStubStatement = false         # see execution environments
+reportInvalidStubStatement = false         # required for type-testing
 reportMissingSuperCall = false
 reportPrivateUsage = false
 reportPropertyTypeMismatch = false
@@ -162,7 +156,7 @@ reportUninitializedInstanceVariable = true
 reportUnnecessaryTypeIgnoreComment = true
 reportUnusedExpression = false
 reportUnusedParameter = false
-reportUnusedVariable = false
+reportUnusedVariable = true
 # basedpyright only
 failOnWarnings = true
 reportIgnoreCommentWithoutRule = true
@@ -174,30 +168,8 @@ reportPrivateLocalImportUsage = true
 reportUnannotatedClassAttribute = false
 strictGenericNarrowing = true
 
-[[executionEnvironments]]
-root = "src"
-reportInvalidStubStatement = true
-reportUnusedCallResult = true
-reportUnusedVariable = true
-
-[[executionEnvironments]]
-root = "test"
-reportAny = true
-reportPrivateUsage = true
-reportUnreachable = true
-# basedpyright only
-reportExplicitAny = true
-reportUnsafeMultipleInheritance = true
-
-[[executionEnvironments]]
-root = "tool"
-reportImplicitOverride = true
-reportInvalidStubStatement = true
-reportUnusedCallResult = true
-
-
 [tool.ruff]
-src = ["src", "test", "tool"]
+src = ["src", "tool"]
 extend-exclude = [".git", ".mypy_cache", ".tox", ".venv"]
 force-exclude = true
 # https://typing.python.org/en/latest/guides/writing_stubs.html#maximum-line-length
@@ -264,6 +236,14 @@ preview = true
         allow-dunder-method-names = ["__array__", "__array_ufunc__"]
 
 
+[tool.pytest.ini_options]
+minversion = "8.0"
+addopts = ["-ra", "--strict-config", "--strict-markers"]
+filterwarnings = ["error"]
+log_cli_level = "INFO"
+xfail_strict = true
+
+
 # install tox with `uv tool install tox --with tox-uv --upgrade`
 # and run with `uvx tox p`
 [tool.tox]

src/_numtype/@test/.ruff.toml

@@ -0,0 +1,7 @@
+extend = "../.ruff.toml"
+
+[lint]
+extend-ignore = [
+    "PYI015", # flake8-pyi: assignment-default-in-stub
+    "PYI017", # flake8-pyi: complex-assignment-in-stub
+]

src/_numtype/@test/test_can_array_0d.pyi

@@ -0,0 +1,28 @@
+import _numtype as _nt
+import numpy as np
+
+###
+# _ToArray1_0d
+
+can_b1_0d: _nt.CanArray0D[np.bool] = np.bool()
+can_i1_0d: _nt.CanArray0D[np.int8] = np.int8()
+can_i2_0d: _nt.CanArray0D[np.int16] = np.int16()
+can_i4_0d: _nt.CanArray0D[np.int32] = np.int32()
+can_i8_0d: _nt.CanArray0D[np.int64] = np.int64()
+can_u1_0d: _nt.CanArray0D[np.uint8] = np.uint8()
+can_u2_0d: _nt.CanArray0D[np.uint16] = np.uint16()
+can_u4_0d: _nt.CanArray0D[np.uint32] = np.uint32()
+can_u8_0d: _nt.CanArray0D[np.uint64] = np.uint64()
+can_f2_0d: _nt.CanArray0D[np.float16] = np.float16()
+can_f4_0d: _nt.CanArray0D[np.float32] = np.float32()
+can_f8_0d: _nt.CanArray0D[np.float64] = np.float64()
+can_ld_0d: _nt.CanArray0D[np.longdouble] = np.longdouble()
+can_c8_0d: _nt.CanArray0D[np.complex64] = np.complex64()
+can_c16_0d: _nt.CanArray0D[np.complex128] = np.complex128()
+can_cld_0d: _nt.CanArray0D[np.clongdouble] = np.clongdouble()
+can_O_0d: _nt.CanArray0D[np.object_] = np.empty((), np.object_)
+can_M_0d: _nt.CanArray0D[np.datetime64] = np.datetime64(None)
+can_m_0d: _nt.CanArray0D[np.timedelta64] = np.timedelta64(None)
+can_S_0d: _nt.CanArray0D[np.bytes_] = np.bytes_(b"")
+can_U_0d: _nt.CanArray0D[np.str_] = np.str_("")
+can_V_0d: _nt.CanArray0D[np.void] = np.void(b"")

src/_numtype/@test/test_sequence_nd.pyi

@@ -0,0 +1,17 @@
+import _numtype as _nt
+
+class A: ...
+
+a0d: A
+a1d: list[A]
+a2d: list[list[A]]
+a3d: list[list[list[A]]]
+a4d: list[list[list[list[A]]]]
+
+###
+
+a1nd__a_0d: _nt.Sequence1ND[A] = a0d  # type: ignore[assignment]  # pyright: ignore[reportAssignmentType]
+a1nd__a_1d: _nt.Sequence1ND[A] = a1d
+a1nd__a_2d: _nt.Sequence1ND[A] = a2d
+a1nd__a_3d: _nt.Sequence1ND[A] = a3d
+a1nd__a_4d: _nt.Sequence1ND[A] = a4d

test/static/test__numtype.pyi renamed to src/_numtype/@test/test_to_array.pyi

@@ -44,38 +44,6 @@ S_3d: list[list[list[bytes]]]
 U_3d: list[list[list[str]]]
 O_3d: list[list[list[object]]]
 
-###
-# nested sequence
-
-nested_bool_1d: _nt.Sequence1ND[bool] = b_1d
-nested_bool_2d: _nt.Sequence1ND[bool] = b_2d
-
-###
-# _ToArray1_0d
-
-can_b1_0d: _nt.CanArray0D[np.bool] = np.bool()
-can_i1_0d: _nt.CanArray0D[np.int8] = np.int8()
-can_i2_0d: _nt.CanArray0D[np.int16] = np.int16()
-can_i4_0d: _nt.CanArray0D[np.int32] = np.int32()
-can_i8_0d: _nt.CanArray0D[np.int64] = np.int64()
-can_u1_0d: _nt.CanArray0D[np.uint8] = np.uint8()
-can_u2_0d: _nt.CanArray0D[np.uint16] = np.uint16()
-can_u4_0d: _nt.CanArray0D[np.uint32] = np.uint32()
-can_u8_0d: _nt.CanArray0D[np.uint64] = np.uint64()
-can_f2_0d: _nt.CanArray0D[np.float16] = np.float16()
-can_f4_0d: _nt.CanArray0D[np.float32] = np.float32()
-can_f8_0d: _nt.CanArray0D[np.float64] = np.float64()
-can_ld_0d: _nt.CanArray0D[np.longdouble] = np.longdouble()
-can_c8_0d: _nt.CanArray0D[np.complex64] = np.complex64()
-can_c16_0d: _nt.CanArray0D[np.complex128] = np.complex128()
-can_cld_0d: _nt.CanArray0D[np.clongdouble] = np.clongdouble()
-can_O_0d: _nt.CanArray0D[np.object_] = np.empty((), np.object_)
-can_M_0d: _nt.CanArray0D[np.datetime64] = np.datetime64(None)
-can_m_0d: _nt.CanArray0D[np.timedelta64] = np.timedelta64(None)
-can_S_0d: _nt.CanArray0D[np.bytes_] = np.bytes_(b"")
-can_U_0d: _nt.CanArray0D[np.str_] = np.str_("")
-can_V_0d: _nt.CanArray0D[np.void] = np.void(b"")
-
 ###
 # bool
 
@@ -144,4 +112,4 @@ bool_3nd_reject_2d: _nt.ToBool_3nd = b1_2d  # type: ignore[assignment]  # pyrigh
 bool_3nd_accept_3d: _nt.ToBool_3nd = b1_3d
 
 ###
-# TODO(jorenham): repeat for all the other `_To` and `_Co` types (codegen)
+# TODO(jorenham): repeat for all the other `_To` array-like types (codegen)

test/.ruff.toml renamed to src/numpy-stubs/@test/.ruff.toml

@@ -1,4 +1,4 @@
-extend = "../pyproject.toml"
+extend = "../../../pyproject.toml"
 line-length = 88
 
 [lint]