Merge pull request #4696 from ivanov/process-to-launcher

move process utilities to jupyterlab_launcher

jupyterlab/commands.py

@@ -22,11 +22,11 @@
 
 from ipython_genutils.tempdir import TemporaryDirectory
 from jupyter_core.paths import jupyter_config_path
+from jupyterlab_launcher.process import which, Process, WatchHelper
 from notebook.nbextensions import GREEN_ENABLED, GREEN_OK, RED_DISABLED, RED_X
 
 from .semver import Range, gte, lt, lte, gt, make_semver
-from .jlpmapp import YARN_PATH, HERE, which
-from .process import Process, WatchHelper
+from .jlpmapp import YARN_PATH, HERE
 
 if sys.version_info.major < 3:
     from urllib2 import Request, urlopen, quote

jupyterlab/jlpmapp.py

@@ -6,12 +6,7 @@
 import sys
 
 import os
-from ipython_genutils.py3compat import which as _which
-
-try:
-    import subprocess32 as subprocess
-except ImportError:
-    import subprocess
+from jupyterlab_launcher.process import which, subprocess
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 YARN_PATH = os.path.join(HERE, 'staging', 'yarn.js')
@@ -39,35 +34,6 @@ def execvp(cmd, argv):
     else:
         os.execvp(cmd, argv)
 
-
-def which(command, env=None):
-    """Get the full path to a command.
-
-    Parameters
-    ----------
-    command: str
-        The command name or path.
-    env: dict, optional
-        The environment variables, defaults to `os.environ`.
-    """
-    env = env or os.environ
-    path = env.get('PATH') or os.defpath
-    command_with_path = _which(command, path=path)
-
-    # Allow nodejs as an alias to node.
-    if command == 'node' and not command_with_path:
-        command = 'nodejs'
-        command_with_path = _which('nodejs', path=path)
-
-    if not command_with_path:
-        if command in ['nodejs', 'node', 'npm']:
-            msg = 'Please install nodejs 5+ and npm before continuing installation. nodejs may be installed using conda or directly from the nodejs website.'
-            raise ValueError(msg)
-        raise ValueError('The command was not found or was not ' +
-                'executable: %s.' % command)
-    return command_with_path
-
-
 def main(argv=None):
     """Run node and return the result.
     """

jupyterlab/tests/test_app.py

@@ -24,7 +24,7 @@
 from ipykernel.kernelspec import write_kernel_spec
 import jupyter_core
 
-from jupyterlab.process_app import ProcessApp
+from jupyterlab_launcher.process_app import ProcessApp
 
 
 HERE = osp.realpath(osp.dirname(__file__))

packages/services/examples/node/main.py

@@ -4,8 +4,8 @@
 from __future__ import print_function, absolute_import
 import json
 import os
-from jupyterlab.process import which
-from jupyterlab.process_app import ProcessApp
+from jupyterlab_launcher.process import which
+from jupyterlab_launcher.process_app import ProcessApp
 
 HERE = os.path.dirname(os.path.realpath(__file__))
 

setup.py

@@ -131,7 +131,7 @@ def run(self):
 
 setup_args['install_requires'] = [
     'notebook>=4.3.1',
-    'jupyterlab_launcher>=0.10.0,<0.11.0',
+    'jupyterlab_launcher>=0.11.0,<0.12.0',
     'ipython_genutils',
     'futures;python_version<"3.0"',
     'subprocess32;python_version<"3.0"'