diff --git a/pandarallel/__init__.py b/pandarallel/__init__.py index 6c63758..57819d6 100644 --- a/pandarallel/__init__.py +++ b/pandarallel/__init__.py @@ -1,3 +1,3 @@ -__version__ = '1.3.2' +__version__ = '1.3.3' from .pandarallel import pandarallel diff --git a/pandarallel/plasma_store.py b/pandarallel/plasma_store.py index 0aecd45..07e0569 100644 --- a/pandarallel/plasma_store.py +++ b/pandarallel/plasma_store.py @@ -11,7 +11,14 @@ def start_plasma_store(plasma_store_memory, verbose=True): tmpdir = tempfile.mkdtemp(prefix=PREFIX_TEMPFILE) plasma_store_name = os.path.join(tmpdir, "plasma_sock") - plasma_store_executable = os.path.join(PLASMA_DIR, "plasma_store_server") + + # Pyarrow version > 0.14 + plasma_store_executable = os.path.join(PLASMA_DIR, "plasma-store-server") + + if not os.path.exists(plasma_store_executable): + # Pyarrow version <= 0.14 + plasma_store_executable = os.path.join(PLASMA_DIR, + "plasma_store_server") command = [plasma_store_executable, "-s", plasma_store_name, diff --git a/pandarallel/utils.py b/pandarallel/utils.py index 59043f1..7974d91 100644 --- a/pandarallel/utils.py +++ b/pandarallel/utils.py @@ -7,7 +7,12 @@ import itertools as _itertools -from pyarrow.lib import PlasmaStoreFull as _PlasmaStoreFull +try: + # Pyarrow version > 0.14 + from pyarrow.plasma import PlasmaStoreFull as _PlasmaStoreFull +except ImportError: + # Pyarrow version <= 0.14 + from pyarrow.lib import PlasmaStoreFull as _PlasmaStoreFull MINIMUM_TERMINAL_WIDTH = 72 diff --git a/setup.py b/setup.py index f718e45..b8366d2 100644 --- a/setup.py +++ b/setup.py @@ -8,13 +8,13 @@ setup( name='pandarallel', - version='1.3.2', + version='1.3.3', python_requires='>=3.5', packages=find_packages(), author='Manu NALEPA', author_email='nalepae@gmail.com', description='An easy to use library to speed up computation (by parallelizing on multi CPUs) with pandas.', - long_description='See https://github.com/nalepae/pandarallel/tree/v1.3.2 for complete user guide.', + long_description='See https://github.com/nalepae/pandarallel/tree/v1.3.3 for complete user guide.', url='https://github.com/nalepae/pandarallel', install_requires=install_requires, license='BSD',