From 536b184244fcbfda1381e57a0ac5717fff976027 2014-03-28 21:49:31 From: Thomas Kluyver Date: 2014-03-28 21:49:31 Subject: [PATCH] Merge pull request #5450 from minrk/no-codename proposal: remove codename --- diff --git a/IPython/core/release.py b/IPython/core/release.py index d49f3d1..0b05f87 100644 --- a/IPython/core/release.py +++ b/IPython/core/release.py @@ -26,7 +26,8 @@ _version_extra = 'dev' # _version_extra = 'rc1' # _version_extra = '' # Uncomment this for full releases -codename = 'Work in Progress' +# release.codename is deprecated in 2.0, will be removed in 3.0 +codename = '' # Construct full version string from these. _ver = [_version_major, _version_minor, _version_patch] diff --git a/IPython/utils/sysinfo.py b/IPython/utils/sysinfo.py index a61c764..003eca4 100644 --- a/IPython/utils/sysinfo.py +++ b/IPython/utils/sysinfo.py @@ -82,7 +82,6 @@ def pkg_info(pkg_path): return dict( ipython_version=release.version, ipython_path=pkg_path, - codename=release.codename, commit_source=src, commit_hash=hsh, sys_version=sys.version, diff --git a/docs/source/conf.py b/docs/source/conf.py index 5bc7f0f..7113048 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -95,8 +95,7 @@ numpydoc_class_members_toctree = False # other places throughout the built documents. # # The full version, including alpha/beta/rc tags. -codename = iprelease['codename'] -release = "%s: %s" % (iprelease['version'], codename) +release = "%s" % iprelease['version'] # Just the X.Y.Z part, no '-dev' version = iprelease['version'].split('-', 1)[0]