Skip to content

Commit 12bfe9e

Browse files
committed
no pytest cmdclass
1 parent 55ec514 commit 12bfe9e

2 files changed

Lines changed: 1 addition & 13 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ script:
5454

5555
- if [[ $TEST_TARGET == 'latest_branca' ]]; then
5656
pip install git+https://github.com/python-visualization/branca.git ;
57-
python setup.py test ;
57+
py.test -vv --ignore=tests/notebooks/test_notebooks.py ;
5858
fi
5959

6060
- if [[ $TEST_TARGET == 'notebooks' ]]; then

setup.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,6 @@
1010
rootpath = os.path.abspath(os.path.dirname(__file__))
1111

1212

13-
class PyTest(TestCommand):
14-
def finalize_options(self):
15-
TestCommand.finalize_options(self)
16-
self.verbose = True
17-
18-
def run_tests(self):
19-
import pytest
20-
errno = pytest.main(self.test_args)
21-
sys.exit(errno)
22-
23-
2413
def read(*parts):
2514
return open(os.path.join(rootpath, *parts), 'r').read()
2615

@@ -76,7 +65,6 @@ def walk_subpkg(name):
7665
'Development Status :: 5 - Production/Stable'],
7766
packages=pkgs,
7867
package_data=pkg_data,
79-
cmdclass=dict(test=PyTest),
8068
tests_require=['pytest'],
8169
license=LICENSE,
8270
install_requires=install_requires,

0 commit comments

Comments
 (0)