Browse Source

Fix version check and add new files to manifest

Steven Silvester 8 years ago
parent
commit
20a7cc4ac6
3 changed files with 9 additions and 7 deletions
  1. 3 3
      MANIFEST.in
  2. 4 2
      jupyterlab/commands.py
  3. 2 2
      setupbase.py

+ 3 - 3
MANIFEST.in

@@ -7,9 +7,9 @@ include README.md
 include package.json
 include setupbase.py
 
-include jupyterlab/package.template.json
+include jupyterlab/package.app.json
 include jupyterlab/webpack.config.js
-include jupyterlab/index.template.js
-include jupyterlab/package_list.txt
+include jupyterlab/index.app.js
+include jupyterlab/released_packages.txt
 
 prune jupyterlab/tests

+ 4 - 2
jupyterlab/commands.py

@@ -3,6 +3,7 @@
 
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
+from distutils.version import LooseVersion
 import errno
 import json
 import pipes
@@ -176,9 +177,10 @@ def should_build(app_dir=None):
         data = json.load(fid)
 
     # Look for mismatched version.
-    if not data['jupyterlab'].get('version', '') == __version__:
+    version = data['jupyterlab'].get('version', '')
+    if LooseVersion(version) != LooseVersion(__version__):
         msg = 'Version mismatch: %s (built), %s (current)'
-        return True, msg % (data['jupyterlab'].get('version', ''), __version__)
+        return True, msg % (version, __version__)
 
     # Look for mismatched extensions.
     _ensure_package(app_dir)

+ 2 - 2
setupbase.py

@@ -75,8 +75,8 @@ def find_package_data():
     Find package_data.
     """
     return {
-        'jupyterlab': ['build/*', 'index.template.js', 'webpack.config.js',
-                       'package.template.json', 'package_list.txt']
+        'jupyterlab': ['build/*', 'index.app.js', 'webpack.config.js',
+                       'package.app.json', 'released_packages.txt']
     }