From 5aab7984ae19efa6aac701a0d2556f9ebf91d60f Mon Sep 17 00:00:00 2001 From: Abhas Bhattacharya Date: Wed, 20 Jan 2016 23:58:47 +0530 Subject: [PATCH 1/3] Use option "--show_status_gui" --- pytest_gui_status/status_plugin/plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pytest_gui_status/status_plugin/plugin.py b/pytest_gui_status/status_plugin/plugin.py index 193de1c..5a2ef71 100644 --- a/pytest_gui_status/status_plugin/plugin.py +++ b/pytest_gui_status/status_plugin/plugin.py @@ -202,7 +202,7 @@ class PYTEST_DATA(object): 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): From f0517dce7bbe026b3a898b4e7c4d12223ad0ff5f Mon Sep 17 00:00:00 2001 From: Abhas Bhattacharya Date: Thu, 21 Jan 2016 16:54:58 +0530 Subject: [PATCH 2/3] Include package_data --- setup.py | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/setup.py b/setup.py index 327ee12..3202ca8 100644 --- a/setup.py +++ b/setup.py @@ -2,33 +2,37 @@ from setuptools import setup packages = [ "pytest_gui_status", - 'pytest_gui_status.status_plugin', - 'pytest_gui_status.status_gui', + "pytest_gui_status.status_plugin", + "pytest_gui_status.status_gui", ] package_dir = { - 'pytest_gui_status': 'pytest_gui_status', - # 'pytest_gui_status.status_plugin': 'status_plugin', - # 'pytest_gui_status.status_gui': 'status_gui', + "pytest_gui_status": "pytest_gui_status", + # "pytest_gui_status.status_plugin": "status_plugin", + # "pytest_gui_status.status_gui": "status_gui", +} +package_data = { + "pytest_gui_status.status_gui": ["tmpl/*"] } setup( - name='pytest_gui_status', - version='0.0.3', - description='Show pytest status in gui', - author='Abhas Bhattacharya', - author_email='abhasbhattacharya2@gmail.com', - # url='http://github.com/joeyespo/pytest-watch', + name="pytest_gui_status", + version="0.0.3", + description="Show pytest status in gui", + author="Abhas Bhattacharya", + author_email="abhasbhattacharya2@gmail.com", + # url="http://github.com/joeyespo/pytest-watch", packages=packages, package_dir=package_dir, - license='MIT', - platforms='any', - install_requires=open('requirements.txt').readlines(), + package_data=package_data, + license="MIT", + platforms="any", + install_requires=open("requirements.txt").readlines(), entry_points={ - 'pytest11': [ - 'pytest_gui_status = pytest_gui_status.status_plugin.plugin', + "pytest11": [ + "pytest_gui_status = pytest_gui_status.status_plugin.plugin", ], - 'console_scripts': [ - 'pytest_gui_status = pytest_gui_status.status_gui.gui_frontend:main', + "console_scripts": [ + "pytest_gui_status = pytest_gui_status.status_gui.gui_frontend:main", ] }, ) From fe75e4122626a7fec4358cb42b9cdee51f55bcc9 Mon Sep 17 00:00:00 2001 From: Abhas Bhattacharya Date: Sat, 23 Jan 2016 10:30:19 +0530 Subject: [PATCH 3/3] Bump version and fix prev pypi upload --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3202ca8..57cef8e 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ package_data = { setup( name="pytest_gui_status", - version="0.0.3", + version="0.0.4", description="Show pytest status in gui", author="Abhas Bhattacharya", author_email="abhasbhattacharya2@gmail.com",