Merging (#1635)

Author: springcoil

docs/source/conf.py

@@ -72,7 +72,7 @@
 # The short X.Y version.
 version = '3.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.0.rc5'
+release = '3.0.rc6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pymc3/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.0.rc5"
+__version__ = "3.0.rc6"
 
 from .blocking import *
 from .distributions import *

setup.py

@@ -12,7 +12,7 @@
 AUTHOR_EMAIL = '[email protected]'
 URL = "http://github.com/pymc-devs/pymc"
 LICENSE = "Apache License, Version 2.0"
-VERSION = "3.0.rc5"
+VERSION = "3.0.rc6"
 
 classifiers = ['Development Status :: 5 - Production/Stable',
                'Programming Language :: Python',
@@ -47,14 +47,14 @@
           license=LICENSE,
           url=URL,
           long_description=LONG_DESCRIPTION,
-          packages=['pymc3', 
-                    'pymc3.backends', 
+          packages=['pymc3',
+                    'pymc3.backends',
                     'pymc3.distributions',
                     'pymc3.examples',
-                    'pymc3.glm', 
-                    'pymc3.step_methods', 
+                    'pymc3.glm',
+                    'pymc3.step_methods',
                     'pymc3.tuning',
-                    'pymc3.tests', 
+                    'pymc3.tests',
                     'pymc3.variational'],
           classifiers=classifiers,
           install_requires=install_reqs,