Merge branch 'release/3.3.1'

wolph · May 29, 2022 · 0d51a3c · 0d51a3c
2 parents 0448374 + 62631f1
commit 0d51a3c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/pytest.ini b/pytest.ini
@@ -6,15 +6,10 @@ python_files =
 addopts =
     --doctest-modules
     --cov python_utils
-    --cov-report html
     --cov-report term-missing
     --mypy
 
-flake8-ignore =
-    *.py W391
-    docs/*.py ALL
-
-doctest_optionflags = 
+doctest_optionflags =
     ALLOW_UNICODE
     ALLOW_BYTES
 

diff --git a/python_utils/__about__.py b/python_utils/__about__.py
@@ -6,4 +6,4 @@
     'with the standard Python install')
 __url__: str = 'https://github.com/WoLpH/python-utils'
 # Omit type info due to automatic versioning script
-__version__ = '3.3.0'
+__version__ = '3.3.1'
diff --git a/python_utils/generators.py b/python_utils/generators.py
@@ -1,3 +1,4 @@
+import asyncio
 import time
 
 import python_utils
@@ -26,8 +27,13 @@ async def abatcher(
 
     while True:
         try:
-            item = await generator.__anext__()
-        except StopAsyncIteration:
+            if interval_s:
+                item = await asyncio.wait_for(
+                    generator.__anext__(), interval_s
+                )
+            else:
+                item = await generator.__anext__()
+        except (StopAsyncIteration, asyncio.TimeoutError):
             if batch:
                 yield batch
             break

diff --git a/setup.py b/setup.py
@@ -42,7 +42,6 @@
                 'pytest',
                 'pytest-cov',
                 'pytest-mypy',
-                'pytest-flake8',
                 'pytest-asyncio',
                 'sphinx',
                 'types-setuptools',