Merge pull request #477 from a-detiste/master

remove six dependency

Author: martindurant

.github/workflows/main.yaml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        CONDA_ENV: [py38, py39, py310]
+        CONDA_ENV: [py39, py310, py311, py312]
     # env:
       # STREAMZ_LAUNCH_KAFKA: true
 
@@ -45,7 +45,7 @@ jobs:
 
       - name: coveralls
         shell: bash -l {0}
-        if: ${{ matrix.os == 'ubuntu-latest' &&  matrix.CONDA_ENV == 'py38' }}
+        if: ${{ matrix.os == 'ubuntu-latest' &&  matrix.CONDA_ENV == 'py312' }}
         run: coveralls
 
   lint:

ci/environment-py38.yml renamed to ci/environment-py311.yml

@@ -3,35 +3,25 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python=3.8
+  - python=3.11
   - pytest
   - flake8
   - black
   - isort
   - tornado
   - toolz
-  - zict
-  - six
-  - librdkafka=1.5.3
+  - librdkafka
   - dask
   - distributed
   - pandas
-  - python-confluent-kafka=1.5.0
-  - numpydoc
-  - sphinx
-  - sphinx_rtd_theme
+  - python-confluent-kafka
   - codecov
   - coverage
   - networkx
   - graphviz
-  - python-graphviz
   - pytest-asyncio
+  - python-graphviz
   - bokeh
-  - ipython
-  - ipykernel
   - ipywidgets
   - flaky
   - pytest-cov
-  - coveralls
-  - paho-mqtt
-  - websockets

ci/environment-py312.yml

@@ -0,0 +1,27 @@
+name: test_env
+channels:
+  - conda-forge
+  - defaults
+dependencies:
+  - python=3.12
+  - pytest
+  - flake8
+  - black
+  - isort
+  - tornado
+  - toolz
+  - librdkafka
+  - dask
+  - distributed
+  - pandas
+  - python-confluent-kafka
+  - codecov
+  - coverage
+  - networkx
+  - graphviz
+  - pytest-asyncio
+  - python-graphviz
+  - bokeh
+  - ipywidgets
+  - flaky
+  - pytest-cov

ci/environment-py39.yml

@@ -11,7 +11,6 @@ dependencies:
   - tornado
   - toolz
   - zict
-  - six
   - librdkafka=1.5.3
   - dask
   - distributed

requirements.txt

@@ -1,5 +1,4 @@
 tornado
 toolz
 zict
-six
-setuptools
+setuptools

setup.py

@@ -17,7 +17,7 @@
       license='BSD',
       keywords='streams',
       packages=packages + tests,
-      python_requires='>=3.8',
+      python_requires='>=3.9',
       long_description=(open('README.rst').read() if exists('README.rst')
                         else ''),
       install_requires=list(open('requirements.txt').read().strip().split('\n')),

streamz/core.py

@@ -4,8 +4,6 @@
 from itertools import chain
 import functools
 import logging
-import six
-import sys
 import threading
 from time import time
 from typing import Any, Callable, Hashable, Union
@@ -1947,8 +1945,8 @@ def f():
             if timeout is not None:
                 future = gen.with_timeout(timedelta(seconds=timeout), future)
             result[0] = yield future
-        except Exception:
-            error[0] = sys.exc_info()
+        except Exception as exc:
+            error[0] = exc
         finally:
             thread_state.asynchronous = False
             e.set()
@@ -1960,7 +1958,8 @@ def f():
     else:
         while not e.is_set():
             e.wait(10)
+
     if error[0]:
-        six.reraise(*error[0])
+        raise error[0]
     else:
         return result[0]

streamz/plugins.py

@@ -13,11 +13,18 @@ def try_register(cls, entry_point, *modifier):
         )
 
 
+def get_entry_point(eps, group):
+    if hasattr(eps, "select"):  # Python 3.10+ / importlib_metadata >= 3.9.0
+        return eps.select(group=group)
+    else:
+        return eps.get(group, [])
+
 def load_plugins(cls):
     eps = importlib.metadata.entry_points()
-    for entry_point in eps.get("streamz.sources", []):
+
+    for entry_point in get_entry_point(eps, "streamz.sources"):
         try_register(cls, entry_point, staticmethod)
-    for entry_point in eps.get("streamz.nodes", []):
+    for entry_point in get_entry_point(eps, "streamz.nodes"):
         try_register(cls, entry_point)
-    for entry_point in eps.get("streamz.sinks", []):
+    for entry_point in get_entry_point(eps, "streamz.sinks"):
         try_register(cls, entry_point)

streamz/utils_test.py

@@ -1,8 +1,8 @@
 import asyncio
 from contextlib import contextmanager
+import io
 import logging
 import os
-import six
 import shutil
 import tempfile
 from time import time, sleep
@@ -85,7 +85,7 @@ def captured_logger(logger, level=logging.INFO, propagate=None):
     if propagate is not None:
         orig_propagate = logger.propagate
         logger.propagate = propagate
-    sio = six.StringIO()
+    sio = io.StringIO()
     logger.handlers[:] = [logging.StreamHandler(sio)]
     logger.setLevel(level)
     try: