Skip to content

Commit 13a4725

Browse files
authored
Merge pull request #499 from grlee77/pytest_4.5_fix
register markers for pytest 4.5 compatibility
2 parents b65662f + cd5b94d commit 13a4725

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ recursive-include demo *
1515
include cythonize.dat
1616

1717
# Add build and testing tools
18-
include tox.ini
18+
include tox.ini pytest.ini
1919
recursive-include util *
2020

2121
# Exclude what we don't want to include

pywt/conftest.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import pytest
2+
3+
4+
def pytest_configure(config):
5+
config.addinivalue_line("markers",
6+
"slow: Tests that are slow.")

0 commit comments

Comments
 (0)