From 6e57d829cb6628610e163524f203245b247a2839 Mon Sep 17 00:00:00 2001
From: Aaron Meurer <asmeurer@gmail.com>
Date: Wed, 4 Aug 2021 16:47:05 -0600
Subject: Rename numpy._array_api to numpy.array_api

Instead of the leading underscore, the experimentalness of the module will be
indicated by omitting a warning on import. That we, we do not have to change
the API from underscore to no underscore when the module is no longer
experimental.
---
 numpy/array_api/_typing.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 numpy/array_api/_typing.py

(limited to 'numpy/array_api/_typing.py')

diff --git a/numpy/array_api/_typing.py b/numpy/array_api/_typing.py
new file mode 100644
index 000000000..4ff718205
--- /dev/null
+++ b/numpy/array_api/_typing.py
@@ -0,0 +1,26 @@
+"""
+This file defines the types for type annotations.
+
+These names aren't part of the module namespace, but they are used in the
+annotations in the function signatures. The functions in the module are only
+valid for inputs that match the given type annotations.
+"""
+
+__all__ = ['Array', 'Device', 'Dtype', 'SupportsDLPack',
+           'SupportsBufferProtocol', 'PyCapsule']
+
+from typing import Any, Sequence, Type, Union
+
+from . import (Array, int8, int16, int32, int64, uint8, uint16, uint32,
+               uint64, float32, float64)
+
+# This should really be recursive, but that isn't supported yet. See the
+# similar comment in numpy/typing/_array_like.py
+NestedSequence = Sequence[Sequence[Any]]
+
+Device = Any
+Dtype = Type[Union[[int8, int16, int32, int64, uint8, uint16,
+                   uint32, uint64, float32, float64]]]
+SupportsDLPack = Any
+SupportsBufferProtocol = Any
+PyCapsule = Any
-- 
cgit v1.2.1


From 8f7d00ed447174d9398af3365709222b529c1cad Mon Sep 17 00:00:00 2001
From: Aaron Meurer <asmeurer@gmail.com>
Date: Fri, 6 Aug 2021 18:22:00 -0600
Subject: Run (selective) black on the array_api submodule

I've omitted a few changes from black that messed up the readability of some
complicated if statements that were organized logically line-by-line, and some
changes that use unnecessary operator spacing.
---
 numpy/array_api/_typing.py | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'numpy/array_api/_typing.py')

diff --git a/numpy/array_api/_typing.py b/numpy/array_api/_typing.py
index 4ff718205..d530a91ae 100644
--- a/numpy/array_api/_typing.py
+++ b/numpy/array_api/_typing.py
@@ -6,21 +6,39 @@ annotations in the function signatures. The functions in the module are only
 valid for inputs that match the given type annotations.
 """
 
-__all__ = ['Array', 'Device', 'Dtype', 'SupportsDLPack',
-           'SupportsBufferProtocol', 'PyCapsule']
+__all__ = [
+    "Array",
+    "Device",
+    "Dtype",
+    "SupportsDLPack",
+    "SupportsBufferProtocol",
+    "PyCapsule",
+]
 
 from typing import Any, Sequence, Type, Union
 
-from . import (Array, int8, int16, int32, int64, uint8, uint16, uint32,
-               uint64, float32, float64)
+from . import (
+    Array,
+    int8,
+    int16,
+    int32,
+    int64,
+    uint8,
+    uint16,
+    uint32,
+    uint64,
+    float32,
+    float64,
+)
 
 # This should really be recursive, but that isn't supported yet. See the
 # similar comment in numpy/typing/_array_like.py
 NestedSequence = Sequence[Sequence[Any]]
 
 Device = Any
-Dtype = Type[Union[[int8, int16, int32, int64, uint8, uint16,
-                   uint32, uint64, float32, float64]]]
+Dtype = Type[
+    Union[[int8, int16, int32, int64, uint8, uint16, uint32, uint64, float32, float64]]
+]
 SupportsDLPack = Any
 SupportsBufferProtocol = Any
 PyCapsule = Any
-- 
cgit v1.2.1