Merge pull request #176 from bdrung/master

Various packaging and documentation fixes
abourget · Feb 2, 2014 · 9af3896 · 9af3896
2 parents da136d5 + dbef02b
commit 9af3896
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,7 +1,10 @@
 include LICENSE
 include AUTHORS
+include CHANGELOG
 include MANIFEST.in
 include README.rst
 recursive-include socketio *py
 exclude socketio/.ropeproject/*
 exclude socketio/sample_protocol_for_doc.py
+recursive-include docs *
+recursive-include tests *
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -17,7 +17,7 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 here = os.path.dirname(__file__)
-socketio_path = os.path.abspath(os.path.join(here, '../../socketio'))
+socketio_path = os.path.abspath(os.path.join(here, '../..'))
 sys.path.insert(0, socketio_path)
 # -- General configuration -----------------------------------------------------
 

diff --git a/docs/source/handler.rst b/docs/source/handler.rst
@@ -1,7 +1,7 @@
 .. _handler_module:
 
 :mod:`socketio.handler`
-======================
+=======================
 
 This is a lower-level transports handler. It is responsible for calling your WSGI application.
 

diff --git a/docs/source/sgunicorn.rst b/docs/source/sgunicorn.rst
@@ -1,7 +1,7 @@
 .. _gunicorn_module:
 
 :mod:`socketio.sgunicorn`
-======================
+=========================
 
 .. automodule:: socketio.sgunicorn
     :members:

diff --git a/docs/source/transports.rst b/docs/source/transports.rst
@@ -1,7 +1,7 @@
 .. _transports_module:
 
 :mod:`socketio.transports`
-======================
+==========================
 
 This is largely an internal module, responsible for translating the
 different fallback mechanisms to one abstracted Socket, dealing with

diff --git a/docs/source/virtsocket.rst b/docs/source/virtsocket.rst
@@ -1,7 +1,7 @@
 .. _virtsocket_module:
 
 :mod:`socketio.virtsocket`
-======================
+==========================
 
 .. automodule:: socketio.virtsocket
     :members:

diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@ def run_tests(self):
     license="BSD",
     url="https://github.com/abourget/gevent-socketio",
     download_url="https://github.com/abourget/gevent-socketio",
-    install_requires=("gevent-websocket",),
+    install_requires=("gevent", "gevent-websocket",),
     setup_requires=('versiontools >= 1.7'),
     cmdclass = {'test': PyTest},
     tests_require=['pytest', 'mock'],