Merge remote-tracking branch 'remote_pypa/master' into feat/setupcfg_handling

cf7bb334 · idle sign · 280d8e98 · 17517111 · cf7bb334 · cf7bb334
Commit cf7bb334 authored Nov 26, 2016 by idle sign
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

setup.cfg setup.cfg +1 -1

setup.py setup.py +1 -1

No files found.
--- a/setup.cfg
+++ b/setup.cfg
 [bumpversion]
-current_version = 28.8.0
+current_version = 29.0.0
 commit = True
 tag = True

--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 setup_params = dict(
    name="setuptools",
-    version="28.8.0",
+    version="29.0.0",
    description="Easily download, build, install, upgrade, and uninstall "
        "Python packages",
    author="Python Packaging Authority",