Skip to content

Commit

Permalink
[requires.io] dependency update
Browse files Browse the repository at this point in the history
  • Loading branch information
requires committed Nov 16, 2014
1 parent 2bb7f3c commit fa8d6eb
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions setup.py
Expand Up @@ -4,7 +4,6 @@
from setuptools import setup, find_packages
from setuptools.command.test import test as TestCommand


dirname = os.path.dirname(__file__)


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


class Tox(TestCommand):
class PyTest(TestCommand):
def finalize_options(self):
TestCommand.finalize_options(self)
self.test_args = ['--recreate']
self.test_args = 'tests'
self.test_suite = True

def run_tests(self):
#import here, cause outside the eggs aren't loaded
import tox
errno = tox.cmdline(self.test_args)
# 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.1.0',
version='1.2.0',
description='A tweet collection manager.',
long_description=long_description,
# Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
Expand Down Expand Up @@ -61,9 +59,11 @@ def run_tests(self):
],
entry_points={
'console_scripts': [
'poultry = poultry.main:dispatcher.dispatch',
'poultry = poultry.main:dispatch',
],
},
tests_require=['tox'],
cmdclass={'test': Tox},
cmdclass={'test': PyTest},
tests_require=[
'pytest>=2.4.2',
],
)

0 comments on commit fa8d6eb

Please sign in to comment.