[vgit] fix vgit import and installation with new directory structure

saulpw · Mar 10, 2023 · 3fa124c · 3fa124c
1 parent 53510c2
commit 3fa124c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/setup.py b/setup.py
@@ -26,7 +26,7 @@
           'windows-curses; platform_system == "Windows"',
           'importlib-metadata >= 3.6',
       ],
-      packages=['visidata', 'visidata.loaders', 'visidata.vendor', 'visidata.tests', 'visidata.ddw', 'visidata.man', 'visidata.themes', 'visidata.features', 'visidata.experimental', 'visidata.apps'],
+      packages=['visidata', 'visidata.loaders', 'visidata.vendor', 'visidata.tests', 'visidata.ddw', 'visidata.man', 'visidata.themes', 'visidata.features', 'visidata.experimental', 'visidata.apps', 'visidata.apps.vgit'],
       data_files=[('share/man/man1', ['visidata/man/vd.1', 'visidata/man/visidata.1'])],
       package_data={'visidata.man': ['vd.1', 'vd.txt'], 'visidata.ddw': ['input.ddw'], 'visidata.tests': ['sample.tsv']},
       license='GPLv3',

diff --git a/visidata/apps/vgit/__init__.py b/visidata/apps/vgit/__init__.py
@@ -1,5 +1,5 @@
-from vgit import abort, statusbar
-from vgit import (
+from . import abort, statusbar
+from . import (
     grep,
     config,
     branch,

diff --git a/visidata/apps/setup.py → visidata/apps/vgit/setup.py b/visidata/apps/setup.py → visidata/apps/vgit/setup.py
@@ -11,10 +11,9 @@
       description='a sleek terminal user interface for git',
       # long_description=open('README.md').read(),
       install_requires=['sh'], # visidata
-      packages=['vgit'],
-      scripts=['bin/vgit'],
-      py_modules=['vgit'],
-      entry_points={'visidata.plugins': 'vgit=vgit'},
+      packages=find_packages(exclude=["tests"]),
+      scripts=['vgit'],
+      entry_points={'visidata.plugins': 'vgit=__main__'},
       author='Saul Pwanson',
       author_email='vgit@saul.pw',
       url='https://github.com/saulpw/visidata/vgit',

diff --git a/visidata/apps/bin/vgit → visidata/apps/vgit/vgit b/visidata/apps/bin/vgit → visidata/apps/vgit/vgit
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 import sys
-from vgit.main import vgit_cli
+from visidata.apps.vgit.main import vgit_cli
 
 
 if __name__ == '__main__':