Merge pull request #12 from Emilv2/master

Update async_timeout and drop loop argument

pydelijn/__init__.py

@@ -1,2 +1,4 @@
 """Initialize the package."""
 NAME = "pydelijn"
+
+__version__ = "1.0.0"

pydelijn/api.py

@@ -29,10 +29,9 @@ class Passages:
     """A class to get passage information."""
 
     def __init__(
-        self, loop, stopid, maxpassages, subscriptionkey, session=None, utcoutput=None
+        self, stopid, maxpassages, subscriptionkey, session=None, utcoutput=None
     ):
         """Initialize the class."""
-        self.loop = loop
         self.session = session
         self.stopid = str(stopid)
         self.stopname = self.stopid
@@ -54,7 +53,7 @@ async def get_stopname(self):
             endpointstop = "{}haltes/{}/{}".format(
                 BASE_URL, str(entitynum), str(self.stopid)
             )
-            common = CommonFunctions(self.loop, self.session, self.subscriptionkey)
+            common = CommonFunctions(self.session, self.subscriptionkey)
             resultstop = await common.api_call(endpointstop)
             if resultstop is not None:
                 self.stopname = "{}, {}".format(
@@ -105,7 +104,7 @@ async def get_passages(self):
         if self.session is None:
             selfcreatedsession = True
         entitynum = self.stopid[:1]
-        common = CommonFunctions(self.loop, self.session, self.subscriptionkey)
+        common = CommonFunctions(self.session, self.subscriptionkey)
         passages = []
         tzone = pytz.timezone("Europe/Brussels")
 

pydelijn/common.py

@@ -11,9 +11,8 @@
 class CommonFunctions:
     """A class for common functions."""
 
-    def __init__(self, loop, session, subscriptionkey):
+    def __init__(self, session, subscriptionkey):
         """Initialize the class."""
-        self.loop = loop
         self.session = session
         self.subscriptionkey = subscriptionkey
 
@@ -24,7 +23,7 @@ async def api_call(self, endpoint):
         if self.session is None:
             self.session = aiohttp.ClientSession()
         try:
-            async with async_timeout.timeout(5, loop=self.loop):
+            async with async_timeout.timeout(5):
                 LOGGER.debug("Endpoint URL: %s", str(endpoint))
                 response = await self.session.get(url=endpoint, headers=headers)
                 if response.status == 200:

setup.py

@@ -1,12 +1,19 @@
 """Setup tools config."""
+import re
+
 import setuptools
 
 with open("README.md", "r") as fh:
     LONG = fh.read()
 
+with open("pydelijn/__init__.py", "r") as fd:
+    version = re.search(
+        r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE
+    ).group(1)
+
 setuptools.setup(
     name="pydelijn",
-    version="0.6.1",
+    version=version,
     author="bollewolle",
     author_email="dev@bollewolle.be",
     python_requires=">=3.5.0",
@@ -18,7 +25,7 @@
     packages=setuptools.find_packages(exclude=('tests',)),
     install_requires=[
         'aiohttp>=3.6.2,<4.0',
-        'async_timeout>=3.0.1,<4.0',
+        'async_timeout>=4.0.0,<5.0',
         'pytz>=2020.1'
     ],
     license='MIT',

tests/example.py

@@ -11,7 +11,7 @@ async def test_pydelijn():
     maxpassages = 10
     custom_session = aiohttp.ClientSession()
     delijndata = Passages(
-        LOOP, stopid, maxpassages, subscriptionkey, custom_session, True
+        stopid, maxpassages, subscriptionkey, custom_session, True
     )
     await delijndata.get_passages()
     print_data(delijndata)