From a8445f7987f4aa7c562ed3a45d12ffd5be9f2f2b Mon Sep 17 00:00:00 2001 From: Jonathan Rocher Date: Wed, 13 Jul 2022 11:27:10 -0500 Subject: [PATCH 1/4] Fix and simplify stage 4.0 --- stage4.0_first_application/pycasa/app/app.py | 3 ++- stage4.0_first_application/setup.py | 19 +++---------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/stage4.0_first_application/pycasa/app/app.py b/stage4.0_first_application/pycasa/app/app.py index 8dfa388..9401829 100644 --- a/stage4.0_first_application/pycasa/app/app.py +++ b/stage4.0_first_application/pycasa/app/app.py @@ -4,7 +4,8 @@ import logging from pyface.tasks.api import TasksApplication, TaskFactory -from ..ui.tasks.hello_world_task import HelloWorldTask + +from pycasa.ui.tasks.hello_world_task import HelloWorldTask logger = logging.getLogger(__name__) diff --git a/stage4.0_first_application/setup.py b/stage4.0_first_application/setup.py index 01bd302..20e6b33 100644 --- a/stage4.0_first_application/setup.py +++ b/stage4.0_first_application/setup.py @@ -1,27 +1,14 @@ -from os.path import abspath, dirname, join -from setuptools import setup, find_packages - -HERE = dirname(abspath(__file__)) -PKG_NAME = "pycasa" - -info = {} -init_file = join(HERE, PKG_NAME, "__init__.py") -exec(open(init_file).read(), globals(), info) +from setuptools import setup, find_packages setup( - name=PKG_NAME, - version=info["__version__"], + name="pycasa", + version="0.0.1", description='Hello world in pyface task', ext_modules=[], packages=find_packages(), data_files=[ (".", ["README.md"]), ], - entry_points={ - 'console_scripts': [ - 'pycasa = {}.app.main:main'.format(PKG_NAME), - ], - }, ) From c378682a2d4ddd4e0f8ac7ba08bf2a09bff82926 Mon Sep 17 00:00:00 2001 From: Jonathan Rocher Date: Wed, 13 Jul 2022 11:28:03 -0500 Subject: [PATCH 2/4] Simplify setup further. --- stage4.0_first_application/setup.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/stage4.0_first_application/setup.py b/stage4.0_first_application/setup.py index 20e6b33..6df429c 100644 --- a/stage4.0_first_application/setup.py +++ b/stage4.0_first_application/setup.py @@ -1,4 +1,3 @@ - from setuptools import setup, find_packages @@ -8,7 +7,5 @@ description='Hello world in pyface task', ext_modules=[], packages=find_packages(), - data_files=[ - (".", ["README.md"]), - ], + data_files=[], ) From 6a63123b53eb2edb0458eacc975b21ea76590c0a Mon Sep 17 00:00:00 2001 From: Jonathan Rocher Date: Wed, 13 Jul 2022 11:28:21 -0500 Subject: [PATCH 3/4] Simplify setup even further. --- stage4.0_first_application/setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/stage4.0_first_application/setup.py b/stage4.0_first_application/setup.py index 6df429c..e71d5f6 100644 --- a/stage4.0_first_application/setup.py +++ b/stage4.0_first_application/setup.py @@ -5,7 +5,5 @@ name="pycasa", version="0.0.1", description='Hello world in pyface task', - ext_modules=[], packages=find_packages(), - data_files=[], ) From 99ddcf2bda6bb22a01742c0cc97ad413f7c8883c Mon Sep 17 00:00:00 2001 From: Jonathan Rocher Date: Wed, 13 Jul 2022 11:48:25 -0500 Subject: [PATCH 4/4] Trigger GH action. --- stage4.0_first_application/setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/stage4.0_first_application/setup.py b/stage4.0_first_application/setup.py index e71d5f6..c97b3ce 100644 --- a/stage4.0_first_application/setup.py +++ b/stage4.0_first_application/setup.py @@ -1,6 +1,5 @@ from setuptools import setup, find_packages - setup( name="pycasa", version="0.0.1",