Merge pull request #918 from wagner-intevation/compatibility

Fix compatibility with current Python versions

Author: underrun

hug/api.py

@@ -631,7 +631,7 @@ def _ensure_started(self):
             if async_handlers:
                 loop = asyncio.get_event_loop()
                 loop.run_until_complete(
-                    asyncio.gather(*[handler(self) for handler in async_handlers], loop=loop)
+                    asyncio.gather(*[handler(self) for handler in async_handlers])
                 )
             for startup_handler in self.startup_handlers:
                 if not startup_handler in async_handlers:

setup.py

@@ -97,8 +97,7 @@ def list_modules(dirname):
     packages=["hug"],
     requires=["falcon", "requests"],
     install_requires=["falcon==2.0.0", "requests"],
-    setup_requires=["pytest-runner"],
-    tests_require=["pytest", "mock", "marshmallow"],
+    tests_require=["pytest", "marshmallow"],
     ext_modules=ext_modules,
     cmdclass=cmdclass,
     python_requires=">=3.5",

tests/test_coroutines.py

@@ -31,8 +31,7 @@ def test_basic_call_coroutine():
     """The most basic Happy-Path test for Hug APIs using async"""
 
     @hug.call()
-    @asyncio.coroutine
-    def hello_world():
+    async def hello_world():
         return "Hello World!"
 
     assert loop.run_until_complete(hello_world()) == "Hello World!"
@@ -42,25 +41,22 @@ def test_nested_basic_call_coroutine():
     """The most basic Happy-Path test for Hug APIs using async"""
 
     @hug.call()
-    @asyncio.coroutine
-    def hello_world():
+    async def hello_world():
         return getattr(asyncio, "ensure_future")(nested_hello_world())
 
     @hug.local()
-    @asyncio.coroutine
-    def nested_hello_world():
+    async def nested_hello_world():
         return "Hello World!"
 
-    assert loop.run_until_complete(hello_world()) == "Hello World!"
+    assert loop.run_until_complete(hello_world()).result() == "Hello World!"
 
 
 def test_basic_call_on_method_coroutine():
     """Test to ensure the most basic call still works if applied to a method"""
 
     class API(object):
         @hug.call()
-        @asyncio.coroutine
-        def hello_world(self=None):
+        async def hello_world(self=None):
             return "Hello World!"
 
     api_instance = API()
@@ -79,8 +75,7 @@ def hello_world(self):
     api_instance = API()
 
     @hug.call()
-    @asyncio.coroutine
-    def hello_world():
+    async def hello_world():
         return api_instance.hello_world()
 
     assert api_instance.hello_world() == "Hello World!"
@@ -94,8 +89,7 @@ class API(object):
         def __init__(self):
             hug.call()(self.hello_world_method)
 
-        @asyncio.coroutine
-        def hello_world_method(self):
+        async def hello_world_method(self):
             return "Hello World!"
 
     api_instance = API()

tests/test_decorators.py

@@ -1586,8 +1586,7 @@ def happens_on_startup(api):
         happened_on_startup.append("non-async")
 
     @hug.startup(api=hug_api)
-    @asyncio.coroutine
-    def async_happens_on_startup(api):
+    async def async_happens_on_startup(api):
         happened_on_startup.append("async")
 
     assert happens_on_startup in hug_api.startup_handlers

tests/test_output_format.py

@@ -366,7 +366,7 @@ def test_json_converter_numpy_types():
     ex_int = numpy.int_(9)
     ex_np_array = numpy.array([1, 2, 3, 4, 5])
     ex_np_int_array = numpy.int_([5, 4, 3])
-    ex_np_float = numpy.float(0.5)
+    ex_np_float = numpy.float64(0.5)
 
     assert 9 == hug.output_format._json_converter(ex_int)
     assert [1, 2, 3, 4, 5] == hug.output_format._json_converter(ex_np_array)