Skip to content

Commit

Permalink
Fix #48
Browse files Browse the repository at this point in the history
  • Loading branch information
nalepae committed Oct 6, 2019
1 parent 94acf2a commit f0d3757
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pandarallel/__init__.py
@@ -1,3 +1,3 @@
__version__ = '1.3.2'
__version__ = '1.3.3'

from .pandarallel import pandarallel
9 changes: 8 additions & 1 deletion pandarallel/plasma_store.py
Expand Up @@ -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

This comment has been minimized.

Copy link
@jeremy-rutman

jeremy-rutman Oct 7, 2019

i don't know if this change was necessary, it doesnt seem to do anything

This comment has been minimized.

Copy link
@nalepae

nalepae Oct 7, 2019

Author Owner

Do you still have your issue after this change?

  • Pyarrow version <= 0.14 uses plasma_store_server (with underscore)
  • Pyarrow version 0.15 uses plasma-store-server (with dash)
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,
Expand Down
7 changes: 6 additions & 1 deletion pandarallel/utils.py
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -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',
Expand Down

0 comments on commit f0d3757

Please sign in to comment.