Skip to content

Commit

Permalink
Fix unittests
Browse files Browse the repository at this point in the history
  • Loading branch information
Antoine Bertin committed Dec 29, 2015
1 parent e85c21f commit 4dadafb
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ install:
- if [ $PARSER = "lxml" ]; then pip install lxml; fi
- pip install coveralls

script: python setup.py test -a "--cov subliminal --verbose $PYTEST_ADDOPTS"
script: python setup.py test --addopts "--cov subliminal --verbose $PYTEST_ADDOPTS"

after_success: coveralls
11 changes: 11 additions & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[pytest]
norecursedirs = build dist env .tox .eggs
addopts = --pep8 --flakes --doctest-glob='*.rst'
pep8maxlinelength = 120
pep8ignore =
docs/conf.py ALL
subliminal/__init__.py E402
flakes-ignore =
docs/conf.py ALL
subliminal/__init__.py UnusedImport
doctest_optionflags= NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL
12 changes: 0 additions & 12 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,3 @@ all_files = 1

[upload_sphinx]
upload-dir = docs/_build/html

[pytest]
norecursedirs = build dist env .tox .eggs
addopts = --pep8 --flakes --doctest-glob='*.rst'
pep8maxlinelength = 120
pep8ignore =
docs/conf.py ALL
subliminal/__init__.py E402
flakes-ignore =
docs/conf.py ALL
subliminal/__init__.py UnusedImport
doctest_optionflags= NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,4 @@
extras_require={
'test': test_requirements,
'dev': dev_requirements
},
cmdclass={'test': PyTest})
})

0 comments on commit 4dadafb

Please sign in to comment.