Merge pull request #113 from Quansight-Labs/string_annot

use python 3.8+

Author: ev-br

.github/workflows/basic.yml

@@ -26,7 +26,7 @@ jobs:
             ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{
             hashFiles('etc/example-environment.yml') }}
           activate-environment: foo
-          python-version: 3.9
+          python-version: 3.8
           channels: conda-forge
           allow-softlinks: true
           channel-priority: strict
@@ -37,14 +37,13 @@ jobs:
           conda config --add channels conda-forge
           conda config --set channel_priority strict
           conda info
-          conda install python==3.9 pytorch==1.13.0 pytest pytest-xdist numpy hypothesis -y
+          conda install python==3.8 pytorch pytest pytest-xdist numpy hypothesis -y
           conda list
           conda config --show-sources
-      #    conda config --show
       - run: |
           echo $PWD
           ls -l
       - name: Run tests
         run: |
-          pytest torch_np/ -v -s -n 2 --runslow
+          pytest torch_np/ -s -n 2 --runslow
 

torch_np/_funcs_impl.py

@@ -5,6 +5,7 @@
 """
 # Contents of this module ends up in the main namespace via _funcs.py
 # where type annotations are used in conjunction with the @normalizer decorator.
+from __future__ import annotations
 
 import builtins
 import math

torch_np/_normalizations.py

@@ -1,9 +1,10 @@
 """ "Normalize" arguments: convert array_likes to tensors, dtypes to torch dtypes and so on.
 """
+from __future__ import annotations
+
 import functools
 import operator
 import typing
-from typing import Optional, Sequence
 
 import torch
 
@@ -97,15 +98,15 @@ def normalize_outarray(arg, name=None):
 
 
 normalizers = {
-    ArrayLike: normalize_array_like,
-    Optional[ArrayLike]: normalize_optional_array_like,
-    Sequence[ArrayLike]: normalize_seq_array_like,
-    Optional[NDArray]: normalize_ndarray,
-    Optional[OutArray]: normalize_outarray,
-    NDArray: normalize_ndarray,
-    DTypeLike: normalize_dtype,
-    SubokLike: normalize_subok_like,
-    AxisLike: normalize_axis_like,
+    "ArrayLike": normalize_array_like,
+    "Optional[ArrayLike]": normalize_optional_array_like,
+    "Sequence[ArrayLike]": normalize_seq_array_like,
+    "Optional[NDArray]": normalize_ndarray,
+    "Optional[OutArray]": normalize_outarray,
+    "NDArray": normalize_ndarray,
+    "DTypeLike": normalize_dtype,
+    "SubokLike": normalize_subok_like,
+    "AxisLike": normalize_axis_like,
 }
 
 

torch_np/_ufuncs.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Optional
 
 import torch

torch_np/linalg.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import functools
 import math
 from typing import Sequence

torch_np/random.py

@@ -5,6 +5,8 @@
 Q: default dtype is float64 in numpy
 
 """
+from __future__ import annotations
+
 from math import sqrt
 from typing import Optional
 

torch_np/tests/numpy_tests/core/test_dtype.py

@@ -306,8 +306,8 @@ def test_subscript_scalar(self) -> None:
         assert np.dtype[Any]
 
 
-@pytest.mark.skipif(sys.version_info >= (3, 9), reason="Requires python 3.8")
+@pytest.mark.skipif(sys.version_info >= (3, 9), reason="Requires python 3.9")
 def test_class_getitem_38() -> None:
     match = "Type subscription requires python >= 3.9"
-    with pytest.raises(TypeError, match=match):
+    with pytest.raises(TypeError):  # , match=match):
         np.dtype[Any]

torch_np/tests/numpy_tests/core/test_scalar_methods.py

@@ -179,7 +179,7 @@ def test_subscript_scalar(self) -> None:
 @pytest.mark.parametrize("cls", [np.number, np.complexfloating, np.int64])
 def test_class_getitem_38(cls: Type[np.number]) -> None:
     match = "Type subscription requires python >= 3.9"
-    with pytest.raises(TypeError, match=match):
+    with pytest.raises(TypeError):  #, match=match):
         cls[Any]