getting ready for 3.2.6 release

aiogremlin/driver/protocol.py

@@ -41,18 +41,18 @@ class GremlinServerWSProtocol(protocol.AbstractBaseProtocol):
         self._transport.write(message)
 
     async def data_received(self, data, results_dict):
-        if data.tp == aiohttp.MsgType.close:
+        if data.tp == aiohttp.WSMsgType.close:
             await self._transport.close()
-        elif data.tp == aiohttp.MsgType.error:
+        elif data.tp == aiohttp.WSMsgType.error:
             # This won't raise properly, fix
             raise data.data
-        elif data.tp == aiohttp.MsgType.closed:
+        elif data.tp == aiohttp.WSMsgType.closed:
             # Hmm
             pass
         else:
-            if data.tp == aiohttp.MsgType.binary:
+            if data.tp == aiohttp.WSMsgType.binary:
                 data = data.data.decode()
-            elif data.tp == aiohttp.MsgType.text:
+            elif data.tp == aiohttp.WSMsgType.text:
                 data = data.data.strip()
             message = json.loads(data)
             request_id = message['requestId']

docs/aiogremlin.driver.aiohttp.rst

-aiogremlin.driver.aiohttp package
-=================================
+aiogremlin\.driver\.aiohttp package
+===================================
 
 Submodules
 ----------
 
-aiogremlin.driver.aiohttp.transport module
-------------------------------------------
+aiogremlin\.driver\.aiohttp\.transport module
+---------------------------------------------
 
 .. automodule:: aiogremlin.driver.aiohttp.transport
     :members:
     :undoc-members:
     :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: aiogremlin.driver.aiohttp
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/aiogremlin.driver.rst

-aiogremlin.driver package
-=========================
+aiogremlin\.driver package
+==========================
 
 Subpackages
 -----------
@@ -11,66 +11,75 @@ Subpackages
 Submodules
 ----------
 
-aiogremlin.driver.client module
--------------------------------
+aiogremlin\.driver\.client module
+---------------------------------
 
 .. automodule:: aiogremlin.driver.client
     :members:
     :undoc-members:
     :show-inheritance:
 
-aiogremlin.driver.cluster module
---------------------------------
+aiogremlin\.driver\.cluster module
+----------------------------------
 
 .. automodule:: aiogremlin.driver.cluster
     :members:
     :undoc-members:
     :show-inheritance:
 
-aiogremlin.driver.connection module
------------------------------------
+aiogremlin\.driver\.connection module
+-------------------------------------
 
 .. automodule:: aiogremlin.driver.connection
     :members:
     :undoc-members:
     :show-inheritance:
 
-aiogremlin.driver.pool module
------------------------------
+aiogremlin\.driver\.pool module
+-------------------------------
 
 .. automodule:: aiogremlin.driver.pool
     :members:
     :undoc-members:
     :show-inheritance:
 
-aiogremlin.driver.protocol module
----------------------------------
+aiogremlin\.driver\.protocol module
+-----------------------------------
 
 .. automodule:: aiogremlin.driver.protocol
     :members:
     :undoc-members:
     :show-inheritance:
 
-aiogremlin.driver.provider module
----------------------------------
+aiogremlin\.driver\.provider module
+-----------------------------------
 
 .. automodule:: aiogremlin.driver.provider
     :members:
     :undoc-members:
     :show-inheritance:
 
-aiogremlin.driver.resultset module
-----------------------------------
+aiogremlin\.driver\.resultset module
+------------------------------------
 
 .. automodule:: aiogremlin.driver.resultset
     :members:
     :undoc-members:
     :show-inheritance:
 
-aiogremlin.driver.server module
--------------------------------
+aiogremlin\.driver\.server module
+---------------------------------
 
 .. automodule:: aiogremlin.driver.server
     :members:
     :undoc-members:
     :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: aiogremlin.driver
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/aiogremlin.process.rst

+aiogremlin\.process package
+===========================
+
+Submodules
+----------
+
+aiogremlin\.process\.graph\_traversal module
+--------------------------------------------
+
+.. automodule:: aiogremlin.process.graph_traversal
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+aiogremlin\.process\.traversal module
+-------------------------------------
+
+.. automodule:: aiogremlin.process.traversal
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: aiogremlin.process
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/aiogremlin.remote.rst

-aiogremlin.remote package
-=========================
+aiogremlin\.remote package
+==========================
 
 Submodules
 ----------
 
-aiogremlin.remote.driver_remote_connection module
--------------------------------------------------
+aiogremlin\.remote\.driver\_remote\_connection module
+-----------------------------------------------------
 
 .. automodule:: aiogremlin.remote.driver_remote_connection
     :members:
     :undoc-members:
     :show-inheritance:
 
-aiogremlin.remote.driver_remote_side_effects module
----------------------------------------------------
+aiogremlin\.remote\.driver\_remote\_side\_effects module
+--------------------------------------------------------
 
 .. automodule:: aiogremlin.remote.driver_remote_side_effects
     :members:
     :undoc-members:
     :show-inheritance:
+
+aiogremlin\.remote\.remote\_connection module
+---------------------------------------------
+
+.. automodule:: aiogremlin.remote.remote_connection
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: aiogremlin.remote
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/aiogremlin.rst

@@ -7,16 +7,26 @@ Subpackages
 .. toctree::
 
     aiogremlin.driver
-    gremlin_python
+    aiogremlin.process
     aiogremlin.remote
+    aiogremlin.structure
 
 Submodules
 ----------
 
-aiogremlin.exception module
----------------------------
+aiogremlin\.exception module
+----------------------------
 
 .. automodule:: aiogremlin.exception
     :members:
     :undoc-members:
     :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: aiogremlin
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/aiogremlin.structure.rst

+aiogremlin\.structure package
+=============================
+
+Submodules
+----------
+
+aiogremlin\.structure\.graph module
+-----------------------------------
+
+.. automodule:: aiogremlin.structure.graph
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: aiogremlin.structure
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/index.rst

@@ -21,19 +21,20 @@ Note that this *NOT* an official Apache project component, it is a
 
 Releases
 ========
-The latest release of :py:mod:`aiogremlin` is **3.2.5**.
+The latest release of :py:mod:`aiogremlin` is **3.2.6**.
 
 
 Requirements
 ============
 
 - Python 3.5+
-- TinkerPop 3.2.5
+- TinkerPop 3.2.6
 
 
 Dependencies
 ============
-- aiohttp 1.3.3
+- aiohttp 2.2.5
+- gremlinpython 3.2.6
 - PyYAML 3.12
 
 
@@ -46,7 +47,7 @@ Install using pip::
 
 For this version, a separate install of gremlinpython is required::
 
-    $ pip install gremlinpython --no-deps
+    $ pip install gremlinpython==3.2.6 --no-deps
 
 
 Getting Started
@@ -99,7 +100,7 @@ In the future there will be CI and more info on contributing.
 Contents:
 
 .. toctree::
-   :maxdepth: 3
+   :maxdepth: 5
 
    usage
    modules

setup.py

 import pip
 from setuptools import setup
-from distutils.command.build_py import build_py as _build_py
-
-
-class build_py(_build_py):
-    """Don't install tornado when installing gremlinpython"""
-    def run(self):
-        pip.main(['install', 'gremlinpython==3.2.5', '--no-deps'])
-        _build_py.run(self)
 
 
 setup(
     name='aiogremlin',
-    version='3.2.5',
+    version='3.2.6',
     url='',
     license='Apache Software License',
     author='davebshow',
@@ -25,10 +17,9 @@ setup(
               'aiogremlin.process',
               'aiogremlin..structure',
               'aiogremlin.remote'],
-    cmdclass={'build_py': build_py},
     install_requires=[
         'aenum==1.4.5',  # required gremlinpython dep
-        'aiohttp==1.3.3',
+        'aiohttp==2.2.5',
         'PyYAML==3.12',
         'six==1.10.0'  # required gremlinpython dep
     ],