From 9523f7438d7b1a579fce8a61533c7e927c97b330 Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Fri, 8 Jan 2016 19:31:01 +0100 Subject: [PATCH 1/3] dev has a dot --- notebook/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notebook/_version.py b/notebook/_version.py index 0d029bff5..6a072c683 100644 --- a/notebook/_version.py +++ b/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:]) From 6aaa27c02491edac09e3b0b667eecebec6224346 Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Fri, 8 Jan 2016 19:34:43 +0100 Subject: [PATCH 2/3] and run jsversion --- notebook/static/base/js/namespace.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notebook/static/base/js/namespace.js b/notebook/static/base/js/namespace.js index 0598c2569..e6c87b31d 100644 --- a/notebook/static/base/js/namespace.js +++ b/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; }); From 9ab90bd8355c4f2b30fd43159d45252865289954 Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Fri, 8 Jan 2016 19:45:36 +0100 Subject: [PATCH 3/3] fix regex --- notebook/tests/test_notebookapp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notebook/tests/test_notebookapp.py b/notebook/tests/test_notebookapp.py index d74857d04..18716c797 100644 --- a/notebook/tests/test_notebookapp.py +++ b/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):