Revert covariant generics and use TypeVar instead (#23)

* Revert covariant generics and use TypeVar instead

* Fix small inconsistency in pyplot.pyi

Author: tmke8

matplotlib-stubs/pyplot.pyi

@@ -1,5 +1,5 @@
-from pathlib import Path as _Path
-from typing import Union, Sequence, Tuple, List, Optional, overload
+from pathlib import Path
+from typing import Union, Sequence, Tuple, List, Optional, overload, TypeVar
 from typing_extensions import Literal
 
 import numpy as _np
@@ -9,7 +9,8 @@ from .legend import Legend
 from .image import AxesImage
 from .text import Text
 
-_Data = Union[float, _np.ndarray[float], Sequence[float]]
+_Float = TypeVar("_Float", bound=_np.floating)
+_Data = Union[float, _np.ndarray[_Float], Sequence[float]]
 
 _LegendLocation = Literal[
     "best",
@@ -28,8 +29,8 @@ class Axes:
     def set_xlabel(self, xlabel: str) -> None: ...
     def set_ylabel(self, ylabel: str) -> None: ...
     def set_title(self, label: str, loc: Literal["left", "center", "right"] = ...) -> None: ...
-    def set_xticks(self, ticks: Union[_np.ndarray[_np.number], Sequence[float]]) -> None: ...
-    def set_yticks(self, ticks: _Data) -> None: ...
+    def set_xticks(self, ticks: Union[_np.ndarray[_Float], Sequence[float]]) -> None: ...
+    def set_yticks(self, ticks: Union[_np.ndarray[_Float], Sequence[float]]) -> None: ...
     def set_xticklabels(self, labels: List[str]) -> Text: ...
     def set_yticklabels(self, labels: List[str]) -> Text: ...
     def grid(
@@ -91,7 +92,7 @@ class Axes:
         self, X: _Data, cmap: str = ..., vmin: float = ..., vmax: float = ...,
     ) -> AxesImage: ...
     def hist(
-        self, x: _Data, bins: Union[int, Sequence[float], _np.ndarray[_np.number]]
+        self, x: _Data, bins: Union[int, Sequence[float], _np.ndarray[_Float]]
     ) -> Tuple[List[_np.ndarray], _np.ndarray, List]: ...
     def plot(
         self,
@@ -114,7 +115,7 @@ class Axes:
 class Figure:
     def savefig(
         self,
-        fname: _Path,
+        fname: Path,
         dpi: int = ...,
         bbox_extra_artists: Sequence[Artist] = ...,
         bbox_inches: Optional[Literal["tight"]] = ...,

numpy-stubs/__init__.pyi

@@ -1,5 +1,77 @@
 """Public API of numpy"""
 from . import testing, random
 
-# manual import wasn't working for some reason but * import does work, so...
-from ._core import *
+from ._core import (
+    ndarray as ndarray,
+    newaxis as newaxis,
+    dtype as dtype,
+    bool_ as bool_,
+    number as number,
+    floating as floating,
+    float32 as float32,
+    float64 as float64,
+    integer as integer,
+    int16 as int16,
+    int32 as int32,
+    int64 as int64,
+    array as array,
+    arange as arange,
+    asarray as asarray,
+    ascontiguousarray as ascontiguousarray,
+    copy as copy,
+    empty as empty,
+    empty_like as empty_like,
+    eye as eye,
+    full as full,
+    full_like as full_like,
+    fromiter as fromiter,
+    fromstring as fromstring,
+    identity as identity,
+    linspace as linspace,
+    load as load,
+    loadtxt as loadtxt,
+    ones as ones,
+    ones_like as ones_like,
+    zeros as zeros,
+    zeros_like as zeros_like,
+    astype as astype,
+    abs as abs,
+    ceil as ceil,
+    clip as clip,
+    concatenate as concatenate,
+    diag as diag,
+    divide as divide,
+    exp as exp,
+    expand_dims as expand_dims,
+    hstack as hstack,
+    log as log,
+    logical_and as logical_and,
+    matmul as matmul,
+    max as max,
+    mean as mean,
+    min as min,
+    nonzero as nonzero,
+    power as power,
+    ravel as ravel,
+    reshape as reshape,
+    sign as sign,
+    split as split,
+    square as square,
+    sqrt as sqrt,
+    stack as stack,
+    std as std,
+    sum as sum,
+    take as take,
+    tile as tile,
+    trace as trace,
+    tril as tril,
+    triu as triu,
+    unique as unique,
+    where as where,
+    savetxt as savetxt,
+    savez as savez,
+    savez_compressed as savez_compressed,
+    matrix as matrix,
+    inf as inf,
+    nan as nan,
+)