Merge pull request #937 from Carreau/dotdev

fix dev notation and regex.

notebook/_version.py

@@ -9,5 +9,5 @@ store the current version info of the notebook.
 
 # Next beta/alpha/rc release: The version number for beta is X.Y.ZbN **without dots**. 
 
-version_info = (4, 2, 0, 'dev')
+version_info = (4, 2, 0, '.dev')
 __version__ = '.'.join(map(str, version_info[:3])) + ''.join(version_info[3:])

notebook/static/base/js/namespace.js

@@ -73,7 +73,7 @@ define(function(){
     // tree
     jglobal('SessionList','tree/js/sessionlist');
 
-    Jupyter.version = "4.2.0dev";
+    Jupyter.version = "4.2.0.dev";
     Jupyter._target = '_blank';
     return Jupyter;
 });

notebook/tests/test_notebookapp.py

@@ -101,7 +101,7 @@ def test_pep440_version():
 
 
 
-pep440re = re.compile('^(\d+)\.(\d+)\.(\d+((a|b|rc)\d+)?)(\.post\d+)?(\.dev\d+)?$')
+pep440re = re.compile('^(\d+)\.(\d+)\.(\d+((a|b|rc)\d+)?)(\.post\d+)?(\.dev\d*)?$')
 
 def raise_on_bad_version(version):
     if not pep440re.match(version):