Merge pull request #937 from Carreau/dotdev

fix dev notation and regex.
This commit is contained in:
Carol Willing 2016-01-08 14:41:36 -08:00
commit 3124eae5ab
3 changed files with 3 additions and 3 deletions

View File

@ -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**. # 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:]) __version__ = '.'.join(map(str, version_info[:3])) + ''.join(version_info[3:])

View File

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

View File

@ -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): def raise_on_bad_version(version):
if not pep440re.match(version): if not pep440re.match(version):