Skip to content
This repository was archived by the owner on Feb 17, 2021. It is now read-only.

Commit bf0664b

Browse files
committed
Merge branch 'master' into release
2 parents 32aa0b8 + 124c184 commit bf0664b

File tree

17 files changed

+628
-811
lines changed

17 files changed

+628
-811
lines changed

LICENSE

+201-674
Large diffs are not rendered by default.

README.md

+19-5
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,18 @@ pip install -e .[dev]
9292

9393
This will also install numpy, pandas and matplotlib to be able to run the tests.
9494

95-
### Pre-pull request checks
95+
### Running CI locally (recommended)
9696

97-
We also include a script that runs the CI checks that will be run when a PR is opened.
97+
We include a script that runs the CI checks that will be run when a PR is opened.
9898
To test these out locally, use the `check_all.sh` script.
9999

100100
```bash
101101
./check_all.sh
102102
```
103103

104+
Below we describe how to run the various checks individually,
105+
but `check_all.sh` should be easier to use.
106+
104107
### Checking compliance with Mypy
105108
The settings for Mypy are specified in the `mypy.ini` file in the repository.
106109
Just running
@@ -115,14 +118,25 @@ We use [Black][black] to format the stub files.
115118
First install `black` and then run
116119

117120
```
118-
black -l 100 -t py36 -S .
121+
black .
119122
```
120-
121123
from the base directory.
122124

125+
### Pytest
126+
127+
```
128+
python -m pytest -vv tests/
129+
```
130+
131+
### Flake8
132+
133+
```
134+
flake8 *-stubs
135+
```
136+
123137
## License
124138

125-
[GPL 3](LICENSE)
139+
[Apache 2.0](LICENSE)
126140

127141

128142
[pep-561]: https://www.python.org/dev/peps/pep-0561/
File renamed without changes.

matplotlib-stubs/pyplot.pyi.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -322,10 +322,10 @@ def fill_between(
322322
**kwargs: Any,
323323
) -> PolyCollection: ...
324324
def axhline(
325-
y: float = ..., xmin: float = ..., xmax: float = ..., ___line2d_kwargs___,
325+
y: float = ..., xmin: float = ..., xmax: float = ..., ___line2d_kwargs___
326326
) -> Line2D: ...
327327
def axvline(
328-
x: float = ..., ymin: float = ..., ymax: float = ..., ___line2d_kwargs___,
328+
x: float = ..., ymin: float = ..., ymax: float = ..., ___line2d_kwargs___
329329
) -> Line2D: ...
330330
def legend(
331331
handles: Sequence[Union[Artist, Tuple[Artist, ...]]] = ...,

mypy.ini

+3
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ disallow_any_unimported = True
1010
disallow_untyped_defs = True
1111
disallow_incomplete_defs = True
1212
warn_incomplete_stub = True
13+
14+
[mypy-pytest.*]
15+
ignore_missing_imports = True

0 commit comments

Comments
 (0)