Merge pull request #479 from telamonian/bump-0.10.0

bump to `0.10.0` for dev branch; final `0.9.0` release system fixes

Author: telamonian

jupyterlab_git/_version.py

@@ -1,5 +1,7 @@
 # Copyright (c) Project Jupyter.
 # Distributed under the terms of the Modified BSD License.
 
-version_info = (0, 9, 0)
-__version__ = ".".join(map(str, version_info))
+version_info = (0, 10, 0)
+flag = ''
+
+__version__ = ".".join(map(str, version_info)) + flag

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/git",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "A JupyterLab extension for version control using git",
   "main": "lib/index.js",
   "style": "style/index.css",

release.py

@@ -20,7 +20,7 @@ def tag(version, dryrun=False, kind=None):
         print("Would tag: {}".format(tag))
     else:
         subprocess.run(['git', 'tag', tag])
-        subprocess.run(['git', 'push', 'origin', tag])
+        subprocess.run(['git', 'push', 'upstream', tag])
 
 def pypi(wheel=True, test=False):
     """release on pypi
@@ -51,11 +51,18 @@ def npmjs(dryrun=False):
 
 def labExtensionVersion(dryrun=False, version=None):
     if version:
+        if 'rc' in version:
+            version,rc = version.split('rc')
+            version = version + '-rc.{}'.format(rc)
+
         force_ver_cmd = ['npm', '--no-git-tag-version', 'version', version, '--force', '--allow-same-version']
+        force_ver_info = ' '.join(force_ver_cmd)
+
         if dryrun:
-            print("Would force npm version with: {}".format(' '.join(force_ver_cmd)))
+            print("Would force npm version with: {}".format(force_ver_info))
         else:
             # force the labextension version to match the supplied version
+            print("> {}".format(force_ver_info))
             subprocess.run(force_ver_cmd)
     else:
         # get single source of truth from the Typescript labextension
@@ -71,17 +78,17 @@ def serverExtensionVersion():
     return get_version(VERSION_PY)
 
 def doRelease(test=False):
-    # prep the build area for the labextension bundle
-    prepLabextensionBundle()
-
     # treat the serverextension version as the "real" single source of truth
     version = serverExtensionVersion()
     # force the labextension version to agree with the serverextension version
-    labExtensionVersion(dryrun=test, version=version)
+    labExtensionVersion(version=version)
 
     # tag with version and push the tag
     tag(dryrun=test, version=version)
 
+    # prep the build area for the labextension bundle
+    prepLabextensionBundle()
+
     # release to pypi and npmjs
     pypi(test=test)
     npmjs(dryrun=test)