Fix plover_plugins install command

Author: mkrnr

.github/workflows/ci/skiplist_default.txt

@@ -9,8 +9,6 @@ CONTRIBUTING.md
 NEWS.md
 README.md
 doc/*
-launch.bat
-launch.sh
 linux/README.md
 linux/packpack.mk
 linux/packpack.sh

MANIFEST.in

@@ -9,8 +9,6 @@ recursive-include doc *.png
 recursive-include doc *.svg
 recursive-include doc *.py
 recursive-include doc *.txt
-include launch.bat
-include launch.sh
 include linux/*
 include linux/appimage/*
 include news.d/api/*
@@ -35,11 +33,4 @@ include test/*.py
 include test/gui_qt/*.py
 include tox.ini
 include windows/*
-# Exclude: CI/Git/GitHub specific files,
-# as well as generated Python files (UI).
-exclude .gitignore
-exclude .readthedocs.yml
-exclude plover/gui_qt/*_rc.py
 exclude plover/gui_qt/*_ui.py
-exclude plover/gui_qt/.gitignore
-prune .github

plover/gui_qt/plugins_manager.py

@@ -21,72 +21,6 @@
 from plover.plugins_manager.utils import running_under_virtualenv
 
 
-def list_plugins(freeze=False):
-    installed_plugins = local_registry.list_plugins()
-    if freeze:
-        available_plugins = {}
-    else:
-        available_plugins = global_registry.list_plugins()
-    for name, installed, available in sorted(
-        (name,
-         installed_plugins.get(name, []),
-         available_plugins.get(name, []))
-        for name in set(itertools.chain(installed_plugins,
-                                        available_plugins))
-    ):
-        latest = available[-1] if available else None
-        current = installed[-1] if installed else None
-        info = latest or current
-        if freeze:
-            if current:
-                print('%s==%s' % (current.name, current.version))
-            continue
-        print('%s (%s)  - %s' % (info.name, info.version, info.summary))
-        if current:
-            print('  INSTALLED: %s' % current.version)
-            if latest:
-                print('  LATEST:    %s' % latest.version)
-
-
-def pip(args, stdin=None, stdout=None, stderr=None, **kwargs):
-    cmd = [sys.executable, '-m',
-           'plover.plugins_manager.pip_wrapper',
-           '--disable-pip-version-check']
-    env = dict(os.environ)
-    # Make sure user plugins are handled
-    # even if user site is not enabled.
-    if not running_under_virtualenv() and not site.ENABLE_USER_SITE:
-        pypath = env.get('PYTHONPATH')
-        if pypath is None:
-            pypath = []
-        else:
-            pypath = pypath.split(os.pathsep)
-        pypath.insert(0, site.USER_SITE)
-        env['PYTHONPATH'] = os.pathsep.join(pypath)
-    command = args.pop(0)
-    if command == 'check':
-        cmd.append('check')
-    elif command == 'install':
-        cmd.extend((
-            'install',
-            '--upgrade-strategy=only-if-needed',
-        ))
-        if not running_under_virtualenv():
-            cmd.append('--user')
-    elif command == 'uninstall':
-        cmd.append('uninstall')
-    elif command == 'list':
-        cmd.extend((
-            'list',
-            '--format=columns',
-        ))
-    else:
-        raise ValueError('invalid command: %s' % command)
-    cmd.extend(args)
-    return subprocess.Popen(cmd, env=env, stdin=stdin,
-                            stdout=stdout, stderr=stderr,
-                            **kwargs)
-
 class PluginsManager(Tool, Ui_PluginsManager):
 
     TITLE = 'Plugins Manager'

plover/plugins_manager/__main__.py

@@ -0,0 +1,94 @@
+
+import os
+import subprocess
+import site
+import sys
+
+from plover.plugins_manager import global_registry,local_registry 
+from plover.plugins_manager.utils import running_under_virtualenv
+
+
+
+def pip(args, stdin=None, stdout=None, stderr=None, **kwargs):
+    cmd = [sys.executable, '-m',
+           'plover.plugins_manager.pip_wrapper',
+           '--disable-pip-version-check']
+    env = dict(os.environ)
+    # Make sure user plugins are handled
+    # even if user site is not enabled.
+    if not running_under_virtualenv() and not site.ENABLE_USER_SITE:
+        pypath = env.get('PYTHONPATH')
+        if pypath is None:
+            pypath = []
+        else:
+            pypath = pypath.split(os.pathsep)
+        pypath.insert(0, site.USER_SITE)
+        env['PYTHONPATH'] = os.pathsep.join(pypath)
+    command = args.pop(0)
+    if command == 'check':
+        cmd.append('check')
+    elif command == 'install':
+        cmd.extend((
+            'install',
+            '--upgrade-strategy=only-if-needed',
+        ))
+        if not running_under_virtualenv():
+            cmd.append('--user')
+    elif command == 'uninstall':
+        cmd.append('uninstall')
+    elif command == 'list':
+        cmd.extend((
+            'list',
+            '--format=columns',
+        ))
+    else:
+        raise ValueError('invalid command: %s' % command)
+    cmd.extend(args)
+    return subprocess.Popen(cmd, env=env, stdin=stdin,
+                            stdout=stdout, stderr=stderr,
+                            **kwargs)
+
+def list_plugins(freeze=False):
+    installed_plugins = local_registry.list_plugins()
+    if freeze:
+        available_plugins = {}
+    else:
+        available_plugins = global_registry.list_plugins()
+    for name, installed, available in sorted(
+        (name,
+         installed_plugins.get(name, []),
+         available_plugins.get(name, []))
+        for name in set(itertools.chain(installed_plugins,
+                                        available_plugins))
+    ):
+        latest = available[-1] if available else None
+        current = installed[-1] if installed else None
+        info = latest or current
+        if freeze:
+            if current:
+                print('%s==%s' % (current.name, current.version))
+            continue
+        print('%s (%s)  - %s' % (info.name, info.version, info.summary))
+        if current:
+            print('  INSTALLED: %s' % current.version)
+            if latest:
+                print('  LATEST:    %s' % latest.version)
+
+
+def main(args=None):
+    if args is None:
+        args = sys.argv[1:]
+    if args[0] == 'list_plugins':
+        assert len(args) <= 2
+        if len(args) > 1:
+            assert args[1] == '--freeze'
+            freeze = True
+        else:
+            freeze = False
+        sys.exit(list_plugins(freeze=freeze))
+    proc = pip(args)
+    sys.exit(proc.wait())
+
+
+if __name__ == '__main__':
+    main()

setup.cfg

@@ -58,6 +58,7 @@ packages =
 [options.entry_points]
 console_scripts =
 	plover              = plover.scripts.main:main
+	plover_plugins      = plover.plugins_manager.__main__:main
 	plover_send_command = plover.scripts.send_command:main
 plover.command =
 	set_config = plover.command.set_config:set_config