Skip to content

Commit

Permalink
tests: args removal
Browse files Browse the repository at this point in the history
  • Loading branch information
jirikuncar committed Aug 25, 2014
1 parent 670f3a9 commit e46c1a0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ install:
- pip install .

script:
- python -m pytest
- python setup.py test

after_success:
- coveralls
Expand Down
8 changes: 5 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@


class PyTest(TestCommand):
user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]

def initialize_options(self):
TestCommand.initialize_options(self)
Expand All @@ -34,7 +33,7 @@ def finalize_options(self):
def run_tests(self):
# import here, cause outside the eggs aren't loaded
import pytest
errno = pytest.main(self.pytest_args)
errno = pytest.main()
sys.exit(errno)


Expand Down Expand Up @@ -67,7 +66,10 @@ def run_tests(self):
'Topic :: Software Development :: Libraries :: Application Frameworks',
'Topic :: Utilities',
],
tests_require=['pytest', 'pytest-cov', 'pytest-pep8', 'cloud', 'coverage'],
tests_require=[
'pytest', 'pytest-cache', 'pytest-cov', 'pytest-pep8', 'cloud',
'coverage'
],
cmdclass={'test': PyTest},
install_requires=['configobj>4.7.0'],
long_description="""\
Expand Down

0 comments on commit e46c1a0

Please sign in to comment.