Merge branch 'master' into release/0.6.x

PyPlanet · May 5, 2018 · f409149 · f409149
2 parents d2be697 + 829e72f
commit f409149
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = False
-current_version = 0.6.0-rc3
+current_version = 0.6.0
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>.*))?
 serialize = 
 	{major}.{minor}.{patch}-{release}

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-0.6.0 (unreleased)
+0.6.0 (5 May 2018)
 ------------------
 
 Core

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -68,9 +68,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.0-rc3'
+version = '0.6.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.0-rc3'
+release = '0.6.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/pyplanet/__init__.py b/pyplanet/__init__.py
@@ -2,5 +2,5 @@
 PyPlanet, a robust and simple Maniaplanet Server Controller for Python 3.5+.
 Please see LICENSE file in root of project.
 """
-__version__ = '0.6.0-rc3'
+__version__ = '0.6.0'
 __author__ = 'Tom Valk'