diff --git a/IPython/core/release.py b/IPython/core/release.py index 4480ad0..955b6d8 100644 --- a/IPython/core/release.py +++ b/IPython/core/release.py @@ -23,7 +23,7 @@ _version_major = 6 _version_minor = 0 _version_patch = 0 _version_extra = '.dev' -# _version_extra = 'rc1' +_version_extra = 'rc1' # _version_extra = '' # Uncomment this for full releases # Construct full version string from these. diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/version6.rst similarity index 95% rename from docs/source/whatsnew/development.rst rename to docs/source/whatsnew/version6.rst index ec150e7..3d0cf48 100644 --- a/docs/source/whatsnew/development.rst +++ b/docs/source/whatsnew/version6.rst @@ -1,15 +1,3 @@ -===================== - Development version -===================== - -This document describes in-flight development work. - -.. warning:: - - Please do not edit this file by hand (doing so will likely cause merge - conflicts for other Pull Requests). Instead, create a new file in the - `docs/source/whatsnew/pr` folder - IPython 6.0 =========== diff --git a/tools/toollib.py b/tools/toollib.py index f5a117d..fd160c5 100644 --- a/tools/toollib.py +++ b/tools/toollib.py @@ -20,7 +20,7 @@ archive = '%s:%s' % (archive_user, archive_dir) sdists = './setup.py sdist --formats=gztar' # Binary dists def buildwheels(): - sh('python3 setupegg.py bdist_wheel' % py) + sh('python3 setupegg.py bdist_wheel') # Utility functions def sh(cmd):