Merge branch 'dev' into docs_to_add

This commit is contained in:
2016-01-23 10:31:02 +05:30
2 changed files with 23 additions and 19 deletions
+1 -1
View File
@@ -202,7 +202,7 @@ class PYTEST_DATA(object):
def pytest_addoption(parser): def pytest_addoption(parser):
parser.addoption("--status_gui", dest="show_status_gui", action="store_true") parser.addoption("--show_status_gui", dest="show_status_gui", action="store_true")
def pytest_configure(config): def pytest_configure(config):
+22 -18
View File
@@ -2,33 +2,37 @@ from setuptools import setup
packages = [ packages = [
"pytest_gui_status", "pytest_gui_status",
'pytest_gui_status.status_plugin', "pytest_gui_status.status_plugin",
'pytest_gui_status.status_gui', "pytest_gui_status.status_gui",
] ]
package_dir = { package_dir = {
'pytest_gui_status': 'pytest_gui_status', "pytest_gui_status": "pytest_gui_status",
# 'pytest_gui_status.status_plugin': 'status_plugin', # "pytest_gui_status.status_plugin": "status_plugin",
# 'pytest_gui_status.status_gui': 'status_gui', # "pytest_gui_status.status_gui": "status_gui",
}
package_data = {
"pytest_gui_status.status_gui": ["tmpl/*"]
} }
setup( setup(
name='pytest_gui_status', name="pytest_gui_status",
version='0.0.3', version="0.0.4",
description='Show pytest status in gui', description="Show pytest status in gui",
author='Abhas Bhattacharya', author="Abhas Bhattacharya",
author_email='abhasbhattacharya2@gmail.com', author_email="abhasbhattacharya2@gmail.com",
# url='http://github.com/joeyespo/pytest-watch', # url="http://github.com/joeyespo/pytest-watch",
packages=packages, packages=packages,
package_dir=package_dir, package_dir=package_dir,
license='MIT', package_data=package_data,
platforms='any', license="MIT",
install_requires=open('requirements.txt').readlines(), platforms="any",
install_requires=open("requirements.txt").readlines(),
entry_points={ entry_points={
'pytest11': [ "pytest11": [
'pytest_gui_status = pytest_gui_status.status_plugin.plugin', "pytest_gui_status = pytest_gui_status.status_plugin.plugin",
], ],
'console_scripts': [ "console_scripts": [
'pytest_gui_status = pytest_gui_status.status_gui.gui_frontend:main', "pytest_gui_status = pytest_gui_status.status_gui.gui_frontend:main",
] ]
}, },
) )