Merge pull request #3859 from minrk/codename

Add "An Afternoon Hack" to docs

IPython/core/release.py

@@ -26,6 +26,8 b" _version_extra = 'dev'"
 #_version_extra = 'rc1'
 # _version_extra = ''  # Uncomment this for full releases
 
+codename = 'An Afternoon Hack'
+
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]
 

IPython/core/usage.py

@@ -550,7 +550,9 b' gui_note = """\\'
 default_banner_parts = [
     'Python %s\n' % (sys.version.split('\n')[0],),
     'Type "copyright", "credits" or "license" for more information.\n\n',
-    'IPython %s -- An enhanced Interactive Python.\n' % (release.version,),
+    'IPython {version} -- An enhanced Interactive Python.\n'.format(
+        version=release.version,
+        ),
     quick_guide
 ]
 

IPython/utils/sysinfo.py

@@ -82,6 +82,7 b' 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,

docs/source/conf.py

@@ -89,9 +89,10 b' github_project_url = "https://github.com/ipython/ipython"'
 # other places throughout the built documents.
 #
 # The full version, including alpha/beta/rc tags.
-release = iprelease['version']
-# The short X.Y version.
-version = '.'.join(release.split('.',2)[:2])
+codename = iprelease['codename']
+release = "%s: %s" % (iprelease['version'], codename)
+# Just the X.Y.Z part, no '-dev'
+version = iprelease['version'].split('-', 1)[0]
 
 
 # There are two options for replacing |today|: either, you set today to some

docs/source/whatsnew/version1.0.rst

@@ -2,8 +2,9 b''
  1.0 Series
 ============
 
-Release 1.0
-===========
+Release 1.0.0: An Afternoon Hack
+================================
+
 
 IPython 1.0 requires Python ≥ 2.6.5 or ≥ 3.2.1.
 It does not support Python 3.0, 3.1, or 2.5.