x/timmy
Code Issues Proposed changes

Fix: require pytest-runner only for test command

Browse Source 
Change-Id: I62b82316745c362f1ecdf97e0f9029b7c136953e
This commit is contained in:
Dmitry Sutyagin 2016-09-21 17:26:01 +03:00
parent e493b44a4d
commit 7eaa5705a2
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
setup.py
View File

@ -17,15 +17,15 @@
from setuptools import setup from setuptools import setup
import os
from timmy.env import project_name, version from timmy.env import project_name, version
import sys
pname = project_name pname = project_name
include_package_data = True
if os.environ.get("READTHEDOCS", False): if sys.argv[1] == 'test':
rqfiles = None setup_requires = ['pytest-runner']
include_package_data = False else:
setup_requires = []
setup(name=pname, setup(name=pname,
@ -40,8 +40,8 @@ setup(name=pname,
long_description=open('README.md').read(), long_description=open('README.md').read(),
packages=[pname, '%s_data' % pname], packages=[pname, '%s_data' % pname],
install_requires=['pyyaml'], install_requires=['pyyaml'],
include_package_data=include_package_data, include_package_data=True,
entry_points={'console_scripts': ['%s=%s.cli:main' % (pname, pname)]}, entry_points={'console_scripts': ['%s=%s.cli:main' % (pname, pname)]},
setup_requires=['pytest-runner'], setup_requires=setup_requires,
tests_require=['pytest'] tests_require=['pytest']
) )

2
test-requirements.txt
View File

@ -9,3 +9,5 @@ testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD
coverage>=3.6 # Apache-2.0 coverage>=3.6 # Apache-2.0
sphinx-argparse sphinx-argparse
pytest-runner
pytest

2
tox.ini
View File

@ -1,6 +1,6 @@
[tox] [tox]
minversion = 2.0 minversion = 2.0
envlist = py34,py27,pypy,pep8 envlist = py27,pypy,pep8
skipsdist = True skipsdist = True
[testenv] [testenv]