instead of yarn use jlpm, which is guaranteed to be installed alongside Jupyterlab (#423)

* instead of `yarn` use `jlpm`, which is guaranteed to be installed w/jlab

* adopt standard practice of installing jlab before running other tests

Author: telamonian

.travis.yml

@@ -6,6 +6,7 @@ cache:
   directories:
     - /home/travis/.yarn-cache/
 script:
+  - pip install 'jupyterlab~=1.0'
   - python setup.py sdist
   - pip install --find-links=dist jupyterlab_git[test]
   - pytest jupyterlab_git

package.json

@@ -12,15 +12,15 @@
     "jupyterlab-extension"
   ],
   "scripts": {
-    "build": "yarn run build:lib",
+    "build": "jlpm run build:lib",
     "build:labextension": "cd jupyterlab_git && rimraf labextension && mkdirp labextension && cd labextension && npm pack ../..",
     "build:lib": "tsc",
-    "build:all": "yarn run build:labextension",
-    "clean": "yarn run clean:lib",
+    "build:all": "jlpm run build:labextension",
+    "clean": "jlpm run clean:lib",
     "clean:lib": "rimraf lib",
     "clean:labextension": "rimraf jupyterlab_git/labextension",
-    "clean:all": "yarn run clean:lib && yarn run clean:labextension",
-    "prepare": "yarn run clean && yarn run build",
+    "clean:all": "jlpm run clean:lib && jlpm run clean:labextension",
+    "prepare": "jlpm run clean && jlpm run build",
     "watch": "tsc -w",
     "test": "jest",
     "lint": "tslint --project .",

setup.py

@@ -5,8 +5,8 @@
 
 from setupbase import (
     create_cmdclass, install_npm, ensure_targets,
-    find_packages, combine_commands, ensure_python,
-    get_version, HERE
+    combine_commands, ensure_python, get_version,
+    HERE
 )
 
 import setuptools
@@ -43,8 +43,9 @@
     package_data_spec=package_data_spec,
     data_files_spec=data_files_spec
 )
+
 cmdclass['jsdeps'] = combine_commands(
-    install_npm(HERE, build_cmd='build:all'),
+    install_npm(HERE, build_cmd='build:all', npm='jlpm'),
     ensure_targets(jstargets),
 )
 
@@ -84,7 +85,7 @@
     extras_require = {
         'test': [
             'pytest',
-            'jupyterlab>=1.0.3',
+            'jupyterlab~=1.0',
         ],
     },
 )

setupbase.py

@@ -341,7 +341,7 @@ def run(self):
             node_modules = pjoin(node_package, 'node_modules')
             is_yarn = os.path.exists(pjoin(node_package, 'yarn.lock'))
 
-            npm_cmd = npm
+            npm_cmd = [npm] if isinstance(npm, str) else npm
 
             if npm is None:
                 if is_yarn:
@@ -697,4 +697,4 @@ def _translate_glob_part(pat):
                 res.append('[%s]' % stuff)
         else:
             res.append(re.escape(c))
-    return ''.join(res)
+    return ''.join(res)