diff --git a/grum.py b/grum.py old mode 100644 new mode 100755 index c713c49..c75205f --- a/grum.py +++ b/grum.py @@ -1,3 +1,7 @@ -from grum.cli import main +#!/usr/bin/env python + +from grum import main main() + + diff --git a/grum/__init__.py b/grum/__init__.py index e69de29..b37bb56 100644 --- a/grum/__init__.py +++ b/grum/__init__.py @@ -0,0 +1,4 @@ + +from .cli import main + + diff --git a/grum/cli/grum.py b/grum/cli.py old mode 100755 new mode 100644 similarity index 69% rename from grum/cli/grum.py rename to grum/cli.py index f66279e..d8d5046 --- a/grum/cli/grum.py +++ b/grum/cli.py @@ -1,11 +1,9 @@ -#!/usr/bin/env python - import sys from PyQt5.QtWidgets import QApplication -from grum import ctrl_c, theme -from grum.mainwin import MainWindow +from . import ctrl_c, theme +from .mainwin import MainWindow def main(): diff --git a/grum/cli/__init__.py b/grum/cli/__init__.py deleted file mode 100644 index 26a800a..0000000 --- a/grum/cli/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .grum import main diff --git a/setup.py b/setup.py index e37e43c..06af227 100644 --- a/setup.py +++ b/setup.py @@ -3,5 +3,7 @@ from setuptools import setup if __name__ == "__main__": setup( install_requires=["pyqt5", "pyqtgraph"], - entry_points={"console_scripts": ["grum=grum.cli:main"]}, + entry_points={"console_scripts": ["grum=grum:main"]}, ) + +