Merge pull request #501 from numpy/120

Author: jorenham

.vscode/settings.json

@@ -1,9 +1,14 @@
 {
   "[markdown]": {
-    "editor.rulers": [130]
+    "editor.rulers": [
+      120
+    ]
   },
   "[python]": {
-    "editor.rulers": [88, 130]
+    "editor.rulers": [
+      88,
+      120
+    ]
   },
   "[toml]": {
     "editor.rulers": [88]

docs/.markdownlint.yaml

@@ -4,7 +4,7 @@ no-hard-tabs: true
 MD007:
   indent: 2
 MD013:
-  line_length: 130
+  line_length: 120
 MD031:
   list_items: false
 MD033:

pyproject.toml

@@ -185,7 +185,7 @@ 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
-line-length = 130
+line-length = 120
 preview = true
 
     [tool.ruff.format]

src/_numtype/.ruff.toml

@@ -1,5 +1,5 @@
 extend = "../../pyproject.toml"
-line-length = 130
+line-length = 120
 
 [lint]
 extend-ignore = [

src/_numtype/__init__.pyi

@@ -185,7 +185,11 @@ MArray = TypeAliasType("MArray", np.ma.MaskedArray[_ShapeT, np.dtype[_ScalarT0]]
 MArray0D = TypeAliasType("MArray0D", np.ma.MaskedArray[tuple[()], np.dtype[_ScalarT0]], type_params=(_ScalarT0,))
 MArray1D = TypeAliasType("MArray1D", np.ma.MaskedArray[tuple[int], np.dtype[_ScalarT0]], type_params=(_ScalarT0,))
 MArray2D = TypeAliasType("MArray2D", np.ma.MaskedArray[tuple[int, int], np.dtype[_ScalarT0]], type_params=(_ScalarT0,))
-MArray3D = TypeAliasType("MArray3D", np.ma.MaskedArray[tuple[int, int, int], np.dtype[_ScalarT0]], type_params=(_ScalarT0,))
+MArray3D = TypeAliasType(
+    "MArray3D",
+    np.ma.MaskedArray[tuple[int, int, int], np.dtype[_ScalarT0]],
+    type_params=(_ScalarT0,),
+)
 
 Matrix = TypeAliasType("Matrix", np.matrix[tuple[int, int], np.dtype[_ScalarT0]], type_params=(_ScalarT0,))
 

src/_numtype/_nep50.pyi

@@ -7,7 +7,16 @@ from typing_extensions import TypeAliasType, TypeVar
 
 import numpy as np
 
-__all__ = ["CanCast0D", "CanCastND", "CanNEP50", "CanNEP50Complex", "CanNEP50Float", "MatchND", "PromoteWith", "PromoteWith0D"]
+__all__ = [
+    "CanCast0D",
+    "CanCastND",
+    "CanNEP50",
+    "CanNEP50Complex",
+    "CanNEP50Float",
+    "MatchND",
+    "PromoteWith",
+    "PromoteWith0D",
+]
 
 _T_co = TypeVar("_T_co", covariant=True)
 _BelowT_contra = TypeVar("_BelowT_contra", bound=np.generic, contravariant=True)

src/_numtype/_scalar_co.pyi

@@ -1,4 +1,4 @@
-from typing import TypeAlias
+from typing import Any, TypeAlias
 
 import numpy as np
 
@@ -37,32 +37,32 @@ __all__ = [
 # See https://github.com/numpy/numtype/issues/366 for the scalar promotion table and
 # https://numpy.org/neps/nep-0050-scalar-promotion.html for the official specification.
 
-co_integer8: TypeAlias = integer8 | np.bool
-co_integer16: TypeAlias = integer16 | co_integer8
-co_integer32: TypeAlias = integer32 | co_integer16
-co_integer64: TypeAlias = np.integer | np.bool
-co_integer = co_integer64
-
 co_int8: TypeAlias = np.int8 | np.bool
 co_int16: TypeAlias = np.int16 | co_integer8
 co_int32: TypeAlias = np.int32 | co_integer16
 co_long: TypeAlias = np.long | co_int32
-co_int64: TypeAlias = np.signedinteger | co_integer32
+co_int64: TypeAlias = np.signedinteger[Any] | co_integer32
 
 co_uint8: TypeAlias = np.uint8 | np.bool
 co_uint16: TypeAlias = np.uint16 | co_uint8
 co_uint32: TypeAlias = np.uint32 | co_uint16
 co_ulong: TypeAlias = np.ulong | co_uint32
-co_uint64: TypeAlias = np.unsignedinteger | np.bool
+co_uint64: TypeAlias = np.unsignedinteger[Any] | np.bool
+
+co_integer8: TypeAlias = integer8 | np.bool
+co_integer16: TypeAlias = integer16 | co_integer8
+co_integer32: TypeAlias = integer32 | co_integer16
+co_integer64: TypeAlias = np.integer[Any] | np.bool
+co_integer = co_integer64
 
 co_float16: TypeAlias = np.float16 | co_integer8
 co_float32: TypeAlias = np.float32 | np.float16 | co_integer16
 co_float64: TypeAlias = np.float64 | np.float32 | np.float16 | co_integer64
-co_float: TypeAlias = np.floating | co_integer
+co_float: TypeAlias = np.floating[Any] | co_integer
 
 co_complex64: TypeAlias = inexact32 | number16 | integer8
 co_complex128: TypeAlias = number64 | number32 | number16 | co_integer
-co_complex: TypeAlias = np.number | np.bool
+co_complex: TypeAlias = np.number[Any] | np.bool
 co_number = co_complex
 
 co_timedelta: TypeAlias = np.timedelta64 | co_integer

src/numpy-stubs/.ruff.toml

@@ -1,5 +1,5 @@
 extend = "../../pyproject.toml"
-line-length = 130
+line-length = 120
 
 [lint]
 extend-ignore = [

src/numpy-stubs/@test/generated/.ruff.toml

@@ -1,5 +1,5 @@
 extend = "../.ruff.toml"
-line-length = 130
+line-length = 120
 
 [lint]
 extend-ignore = [

src/numpy-stubs/@test/static/.ruff.toml

@@ -1,5 +1,5 @@
 extend = "../.ruff.toml"
-line-length = 130
+line-length = 120
 
 [lint]
 extend-ignore = [