* versions from `0.6.0.dev` to `0.6.0`.

* changelog update.

diff --git a/Changelog.markdown b/Changelog.markdown
index 6b6020511e431b7a3ebc65acb77ab47dd504cf07..8b11250e2ffbc6948dd230b5ef67319e42e8a186 100644 (file)
--- a/Changelog.markdown
+++ b/Changelog.markdown
@@ -27,7 +27,7 @@ up-to-date than manual and if conflicts appear they should follow the order:
 
 ----
 
-#### Version `0.6.0` (for now, may change)
+#### Version `0.6.0`
 
 In this release some bugs due to Diaspora changes where adressed, it also 
 contains some new functionality. Also if `BeautifulSoup4` is installed it 
@@ -69,6 +69,7 @@ Note: In this version indentation changed from spaces to tabs.
 * __new__:  It is now possible to set `diaspy.people.User()` it's data manual by the `data` parameter,
 * __new__:  `diaspy.people.Contacts()` has new methods `add()` and `remove()` wich can add/remove a user to/from an aspect,
 * __new__:  Added BeautifulSoup4 (optional) support where possible instead of regex, kept regex as fallback,
+* __new__:  `diaspy.connection.Connection().podswitch()` has now a optional param `login` with as default set to `True`, if `False` it will only set the data and does not call `login()`,
 
 
 * __rem__:  `_obtain()` from `diaspy.streams.Outer()`, it was the same as `_obtain()` in `diaspy.streams.Generic()`,

diff --git a/diaspy/__init__.py b/diaspy/__init__.py
index 856cb518beb535c3279e57c09ab5293a28a810aa..fee78fdc579370103693bf50af72c7f57abf5e85 100644 (file)
--- a/diaspy/__init__.py
+++ b/diaspy/__init__.py
@@ -10,4 +10,4 @@ import diaspy.notifications as notifications
 import diaspy.settings as settings
 
 
-__version__ = '0.6.0.dev'
+__version__ = '0.6.0'

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 9413688d156366bdf1df1a7b16f76ab50fda5d63..3e71fe474e5c8918155de094c5e20c652e5db89b 100644 (file)
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -53,7 +53,7 @@ copyright = '2013, Moritz Kiefer, Marek Marecki and others'
 # The short X.Y version.
 version = '0.6.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.0.dev'
+release = '0.6.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
index 8171e53ac2d84578cda7f4880696b62ee1b89a9c..34f03ed6b5c825547f4d6c829e1d2dcb6d66d195 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='diaspy-api',
-    version='0.6.0.dev',
+    version='0.6.0',
     author='Marek Marecki',
     author_email='marekjm@ozro.pw',
     url='https://github.com/marekjm/diaspy',