Merge pull request #212 from onefinestay/floating-deps

Let dependencies float; some minor changes to support more versions

.travis.yml

@@ -12,6 +12,7 @@ install:
 env:
     - TOX_ENV=pinned
     - TOX_ENV=latest
+    - TOX_ENV=oldest
     - TOX_ENV=docs
     - TOX_ENV=spelling
 

nameko/web/server.py

@@ -3,7 +3,8 @@
 
 import eventlet
 from eventlet import wsgi
-from eventlet.wsgi import HttpProtocol, BaseHTTPServer, support, BROKEN_SOCK
+from eventlet.support import get_errno
+from eventlet.wsgi import HttpProtocol, BaseHTTPServer, BROKEN_SOCK
 from werkzeug.exceptions import HTTPException
 from werkzeug.routing import Map
 from werkzeug.wrappers import Request
@@ -28,7 +29,7 @@ def finish(self):
             BaseHTTPServer.BaseHTTPRequestHandler.finish(self)
         except socket.error as e:
             # Broken pipe, connection reset by peer
-            if support.get_errno(e) not in BROKEN_SOCK:
+            if get_errno(e) not in BROKEN_SOCK:
                 raise
         self.connection.close()
 

setup.py

@@ -13,12 +13,13 @@
     url='http://github.com/onefinestay/nameko',
     packages=find_packages(exclude=['test', 'test.*']),
     install_requires=[
-        "eventlet",
-        "kombu<=3.0.4",
-        "mock",
+        "eventlet>=0.15.0",
+        "iso8601",
+        "kombu>=3.0.1",
+        "mock>=1.0.1",
         "path.py>=6.2",
-        "pyrabbit",
-        "Werkzeug",
+        "pyrabbit>=1.0.1",
+        "werkzeug>=0.9",
     ],
     extras_require={
         'dev': [

test/test_serialization.py

@@ -28,7 +28,7 @@ def event(self, evt_data):
         entrypoint_called(evt_data)
 
 
-def test_rpc_serializationx(container_factory, rabbit_config):
+def test_rpc_serialization(container_factory, rabbit_config):
 
     container = container_factory(Service, rabbit_config)
     container.start()
@@ -70,7 +70,7 @@ def test_rpc_proxy_serialization_error(container_factory, rabbit_config):
     container.start()
 
     with ServiceRpcProxy('service', rabbit_config) as proxy:
-        with pytest.raises(TypeError):
+        with pytest.raises(Exception):
             proxy.echo(uuid.uuid4())
 
         assert proxy.echo('foo') == "foo"  # subsequent calls ok

tox.ini

@@ -1,17 +1,25 @@
 [tox]
-envlist = {pinned,latest}, docs, spelling
+envlist = {pinned,latest,oldest}, docs, spelling
 skipsdist = True
 
 [testenv]
 deps =
-    latest: eventlet  # need something
+    oldest: eventlet==0.15.0
+    oldest: kombu==3.0.1
+    oldest: mock==1.0.1
+    oldest: path.py==6.2
+    oldest: pyrabbit==1.0.1
+    oldest: werkzeug==0.9
+
     pinned: eventlet==0.15.2
     pinned: iso8601==0.1.8
     pinned: kombu==3.0.4
     pinned: mock==1.0.1
     pinned: path.py==5.1
     pinned: pyrabbit==1.1.0
-    pinned: Werkzeug==0.9.6
+    pinned: werkzeug==0.9.6
+
+    latest: eventlet  # need something
 
 commands =
     pip install --editable .[dev]