Skip to content

Commit d944a53

Browse files
committed
Add back Matplotlib as a required dependency
1 parent 0165446 commit d944a53

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ matrix:
3737
env: TOXENV=py37-test-mpl30
3838
- python: 3.8
3939
env: TOXENV=py38-test-mpl31
40-
- python: 3.8
41-
env: TOXENV=py38-test-minimal
4240
- python: 3.8
4341
env: TOXENV=codestyle
4442

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ packages = find:
2929
# installing Matplotlib unecessarily.
3030
install_requires =
3131
pytest
32+
matplotlib
3233

3334
[options.entry_points]
3435
pytest11 =
@@ -37,7 +38,6 @@ pytest11 =
3738
[options.extras_require]
3839
test =
3940
pytest-cov
40-
matplotlib
4141

4242
[tool:pytest]
43-
testpaths = "tests"
43+
testpaths = "tests"

tox.ini

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,12 @@ deps =
2323
mpl31: matplotlib==3.1.*
2424
mpldev: git+https://github.com/matplotlib/matplotlib.git#egg=matplotlib
2525
extras =
26-
!minimal: test
26+
test
2727
commands =
2828
pip freeze
2929
# Make sure the tests pass with and without --mpl
30-
!minimal: pytest '{toxinidir}' {posargs}
31-
!minimal: pytest '{toxinidir}' --mpl --cov pytest_mpl {posargs}
32-
# Make sure that the plugin won't crash pytest if Matplotlib isn't installed
33-
minimal: python -c 'import pytest_mpl.plugin'
30+
pytest '{toxinidir}' {posargs}
31+
pytest '{toxinidir}' --mpl --cov pytest_mpl {posargs}
3432

3533
[testenv:codestyle]
3634
skip_install = true

0 commit comments

Comments
 (0)