Merge pull request #146 from zakv/bump-to-3-3-0

Bumped version number to 3.3.0.

docs/conf.py

@@ -70,9 +70,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.2'
+version = '3.3'
 # The full version, including alpha/beta/rc tags.
-release = '3.2.1'
+release = '3.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -152,7 +152,7 @@
 
 # The name for this set of Sphinx documents.
 # "<project> v<release> documentation" by default.
-#html_title = 'M-LOOP v3.2.1'
+#html_title = 'M-LOOP v3.3.0'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None

mloop/__init__.py

@@ -12,5 +12,5 @@
 
 import os
 
-__version__= "3.2.1"
+__version__ = '3.3.0'
 __all__ = ['controllers','interfaces','launchers','learners','nnlearner','testing','utilities','visualizations','cmd']

setup.py

@@ -26,7 +26,7 @@ def main():
                 'M-LOOP = mloop.cmd:run_mloop'
             ],
         },
-        
+
         setup_requires=['pytest-runner'],
         install_requires = ['pip>=7.0',
                             'docutils>=0.3',
@@ -49,7 +49,7 @@ def main():
         license = 'MIT',
         keywords = 'automated machine learning optimization optimisation science experiment quantum',
         url = 'https://github.com/michaelhush/M-LOOP/', 
-        download_url = 'https://github.com/michaelhush/M-LOOP/tarball/3.2.1',
+        download_url = 'https://github.com/michaelhush/M-LOOP/tarball/v3.3.0',
 
         classifiers = ['Development Status :: 2 - Pre-Alpha',
                       'Intended Audience :: Science/Research',
@@ -59,9 +59,9 @@ def main():
                       'Operating System :: MacOS :: MacOS X',
                       'Operating System :: POSIX :: Linux',
                       'Operating System :: Microsoft :: Windows',
-    				  'Programming Language :: Python :: 2.7',
-    				  'Programming Language :: Python :: 3.4',
-    				  'Programming Language :: Python :: 3.5',
+                      'Programming Language :: Python :: 2.7',
+                      'Programming Language :: Python :: 3.4',
+                      'Programming Language :: Python :: 3.5',
                       'Programming Language :: Python :: Implementation :: CPython',
                       'Topic :: Scientific/Engineering',
                       'Topic :: Scientific/Engineering :: Artificial Intelligence',