Merge branch 'master' into channels2

Author: syrusakbary

setup.py

@@ -5,58 +5,59 @@
 
 from setuptools import setup, find_packages
 
-with open('README.rst') as readme_file:
+with open("README.rst") as readme_file:
     readme = readme_file.read()
 
 readme = ""
 
-with open('HISTORY.rst') as history_file:
+with open("HISTORY.rst") as history_file:
     history = history_file.read()
 
 requirements = [
-    'graphql-core>=2.0<3',
+    "graphql-core>=2.0<3",
     # TODO: put package requirements here
 ]
 
 setup_requirements = [
-    'pytest-runner',
+    "pytest-runner",
     # TODO(graphql-python): put setup requirements (distutils extensions,
     # etc.) here
 ]
 
 test_requirements = [
-    'pytest',
+    "pytest",
     # TODO: put package test requirements here
 ]
 
 setup(
-    name='graphql-ws',
-    version='0.2.0',
+    name="graphql-ws",
+    version="0.3.0",
     description="Websocket server for GraphQL subscriptions",
-    long_description=readme + '\n\n' + history,
+    long_description=readme + "\n\n" + history,
     author="Syrus Akbary",
     author_email='me@syrusakbary.com',
     url='https://github.com/graphql-python/graphql-ws',
     packages=find_packages(include=['graphql_ws', 'graphql_ws.*']),
+    author_email="me@syrusakbary.com",
     include_package_data=True,
     install_requires=requirements,
     license="MIT license",
     zip_safe=False,
-    keywords=['graphql', 'subscriptions', 'graphene', 'websockets'],
+    keywords=["graphql", "subscriptions", "graphene", "websockets"],
     classifiers=[
-        'Development Status :: 2 - Pre-Alpha',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-        'Natural Language :: English',
+        "Development Status :: 2 - Pre-Alpha",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: MIT License",
+        "Natural Language :: English",
         "Programming Language :: Python :: 2",
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
+        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
     ],
-    test_suite='tests',
+    test_suite="tests",
     tests_require=test_requirements,
     setup_requires=setup_requirements,
 )