Merge pull request #1963 from blink1073/fix-version-handling

Fix version handling in the application

jupyterlab/_version.py

@@ -1,2 +1,2 @@
-version_info = (0, 18, 0, 'dev')
+version_info = (0, 18, 0, 'dev0')
 __version__ = ".".join(map(str, version_info))

jupyterlab/src/main.ts

@@ -60,7 +60,7 @@ function createLab(loader: ModuleLoader): JupyterLab {
     loader,
     gitDescription: process.env.GIT_DESCRIPTION,
     namespace: 'jupyterlab',
-    version: require('../../package.json').version
+    version: process.env.JUPYTERLAB_VERSION
   });
   lab.registerPluginModules(mods);
   return lab;

jupyterlab/tests/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@jupyterlab/python-tests",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {},
+  "devDependencies": {}
+}

jupyterlab/tests/test_labextensions.py

@@ -372,7 +372,8 @@ class TestInstallLabExtension(TestCase):
         assert 'mockextension' in manifest
         mod = manifest['mockextension']
         assert mod['name'] == 'mockextension'
-        assert 'jupyterlab/tests/mockextension/index.js' in mod['entry']
+        modname = '@jupyterlab/python-tests@0.1.0/mockextension/index.js'
+        assert modname in mod['entry']
         filename = 'mockextension.bundle.js'
         assert mod['files'][0] == filename
         assert mod['id'] == 0

jupyterlab/webpack.config.js

@@ -10,8 +10,7 @@ var buildExtension = require('@jupyterlab/extension-builder/lib/builder').buildE
 var webpack = require('webpack');
 
 
-console.log('Generating bundles...');
-
+// Get the git description.
 try {
   var notice = childProcess.execSync('git describe', { encoding: 'utf8' });
 } catch (e) {
@@ -19,6 +18,20 @@ try {
 }
 
 
+// Get the python package version.
+var cwd = process.cwd();
+process.chdir('..');
+try {
+  var version = childProcess.execSync('python setup.py --version', { encoding: 'utf8' });
+} catch (e) {
+  var version = 'unknown';
+}
+process.chdir(cwd);
+
+
+// Build the main extension.
+console.log('Generating bundles...');
+
 buildExtension({
   name: 'main',
   entry: './build/main',
@@ -30,7 +43,8 @@ buildExtension({
     plugins: [
       new webpack.DefinePlugin({
         'process.env': {
-          'GIT_DESCRIPTION': JSON.stringify(notice.trim())
+          'GIT_DESCRIPTION': JSON.stringify(notice.trim()),
+          'JUPYTERLAB_VERSION': JSON.stringify(version.trim())
         }
       })
     ]

package.json

@@ -1,8 +1,6 @@
 {
-  "name": "@jupyterlab/private",
-  "version": "0.1.0",
-  "dependencies": {
-  },
+  "private": true,
+  "dependencies": {},
   "devDependencies": {
     "lerna": "2.0.0-beta.38"
   },