##// END OF EJS Templates
Merge pull request #5450 from minrk/no-codename...
Thomas Kluyver -
r16047:536b1842 merge
parent child Browse files
Show More
@@ -26,7 +26,8 b" _version_extra = 'dev'"
26 # _version_extra = 'rc1'
26 # _version_extra = 'rc1'
27 # _version_extra = '' # Uncomment this for full releases
27 # _version_extra = '' # Uncomment this for full releases
28
28
29 codename = 'Work in Progress'
29 # release.codename is deprecated in 2.0, will be removed in 3.0
30 codename = ''
30
31
31 # Construct full version string from these.
32 # Construct full version string from these.
32 _ver = [_version_major, _version_minor, _version_patch]
33 _ver = [_version_major, _version_minor, _version_patch]
@@ -82,7 +82,6 b' def pkg_info(pkg_path):'
82 return dict(
82 return dict(
83 ipython_version=release.version,
83 ipython_version=release.version,
84 ipython_path=pkg_path,
84 ipython_path=pkg_path,
85 codename=release.codename,
86 commit_source=src,
85 commit_source=src,
87 commit_hash=hsh,
86 commit_hash=hsh,
88 sys_version=sys.version,
87 sys_version=sys.version,
@@ -95,8 +95,7 b' numpydoc_class_members_toctree = False'
95 # other places throughout the built documents.
95 # other places throughout the built documents.
96 #
96 #
97 # The full version, including alpha/beta/rc tags.
97 # The full version, including alpha/beta/rc tags.
98 codename = iprelease['codename']
98 release = "%s" % iprelease['version']
99 release = "%s: %s" % (iprelease['version'], codename)
100 # Just the X.Y.Z part, no '-dev'
99 # Just the X.Y.Z part, no '-dev'
101 version = iprelease['version'].split('-', 1)[0]
100 version = iprelease['version'].split('-', 1)[0]
102
101
General Comments 0
You need to be logged in to leave comments. Login now