Build: Relax ipyparallel

Author: adrien-berchet

bluepyparallel/parallel.py

@@ -1,4 +1,5 @@
 """Parallel helper."""
+import importlib.metadata
 import json
 import logging
 import multiprocessing
@@ -9,6 +10,7 @@
 from multiprocessing.pool import Pool
 
 import numpy as np
+from packaging import version
 
 try:
     import dask.distributed
@@ -30,6 +32,8 @@
 try:
     import ipyparallel
 
+    ipyparallel_major_version = version.parse(importlib.metadata.version("ipyparallel")).major
+
     ipyparallel_available = True
 except ImportError:  # pragma: no cover
     ipyparallel_available = False
@@ -194,7 +198,8 @@ def get_mapper(self, batch_size=None, chunk_size=None, **kwargs):
         if "ordered" not in kwargs:  # pragma: no cover
             kwargs["ordered"] = False
 
-        self._chunksize_to_kwargs(chunk_size, kwargs)
+        if ipyparallel_major_version < 7:  # pragma: no cover
+            self._chunksize_to_kwargs(chunk_size, kwargs)
 
         def _mapper(func, iterable, *func_args, **func_kwargs):
             mapped_func = self.mappable_func(func, *func_args, **func_kwargs)

setup.py

@@ -15,10 +15,11 @@
 
 reqs = [
     "pandas>=1.3",
-    "ipyparallel>=6.3,<7",
+    "ipyparallel>=6.3",
     "dask[dataframe, distributed]>=2021.11",
     "dask-mpi>=2021.11",
     "distributed>=2021.11",
+    "packaging>=20",
     "sqlalchemy>=1.4.24",
     "sqlalchemy<2; python_version<'3.8'",
     "sqlalchemy-utils>=0.37.2",

tox.ini

@@ -25,12 +25,12 @@ setenv =
 deps =
     min_versions: Requirements-Builder
 commands_pre =
-    - ipcluster stop --cluster-id={[base]name}_{envname} --signal 9 --debug
-    ipcluster start -n 2 --daemonize --log-to-file --cluster-id={[base]name}_{envname} --debug
-commands =
     min_versions: requirements-builder --level=min --extras=test -o {envtmpdir}/requirements_min.txt setup.py
     min_versions: pip install -r {envtmpdir}/requirements_min.txt
     min_versions: pip freeze
+    - ipcluster stop --cluster-id={[base]name}_{envname} --signal 9 --debug
+    ipcluster start -n 2 --daemonize --log-to-file --cluster-id={[base]name}_{envname} --debug
+commands =
     pytest \
         --basetemp={envtmpdir} \
         --cov={[base]name} \
@@ -47,7 +47,7 @@ commands =
         -k "not TestBenchmark" \
         {posargs}
 commands_post =
-    - ipcluster stop --cluster-id={[base]name}_{envname} --debug
+    - ipcluster stop --cluster-id={[base]name}_{envname} --signal 9 --debug
 
 [testenv:coverage]
 skip_install = true