Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions requirements-testing.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pytest-cov==1.8.1
pytest-cov==2.6.1
pytest-pep8==1.0.6
python-coveralls==2.4.3
python-coveralls==2.9.1
18 changes: 1 addition & 17 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import sys

from setuptools import setup, find_packages
from setuptools.command.test import test as TestCommand

dirname = os.path.dirname(__file__)

Expand All @@ -13,22 +12,9 @@
long_description += '\n' + f.read()


class PyTest(TestCommand):
def finalize_options(self):
TestCommand.finalize_options(self)
self.test_args = 'tests'
self.test_suite = True

def run_tests(self):
# import here, cause outside the eggs aren't loaded
import pytest
errno = pytest.main(self.test_args)
sys.exit(errno)


setup(
name='poultry',
version='1.4.0',
version='1.5.2',
description='A tweet collection manager.',
long_description=long_description,
# Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
Expand All @@ -41,7 +27,6 @@ def run_tests(self):
'Operating System :: Microsoft :: Windows',
'Operating System :: MacOS :: MacOS X',
'Topic :: Utilities',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 3',
],
keywords='',
Expand All @@ -63,7 +48,6 @@ def run_tests(self):
'poultry = poultry.main:dispatch',
],
},
cmdclass={'test': PyTest},
tests_require=[
'pytest>=2.4.2',
],
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
# and then run "tox" from this directory.

[tox]
envlist = py27,py34,py33,pypy
envlist = py36

[testenv]
commands = py.test tests README.rst --pep8 --junitxml={envlogdir}/junit-{envname}.xml []
#commands = py.test tests README.rst --pep8 --junitxml={envlogdir}/junit-{envname}.xml []
commands = py.test tests README.rst []
deps = -r{toxinidir}/requirements-testing.txt

[pytest]
Expand Down