From 640ab8f9c58fce0fa583246f380ab4084ddc23a6 Mon Sep 17 00:00:00 2001 From: Jianfeng Mao <4297243+jmao-denver@users.noreply.github.com> Date: Tue, 29 Oct 2024 12:32:35 -0600 Subject: [PATCH] fix: Add numpy as a required dependency for py client (#6308) and clean up setup.py a bit Fixes #6304 --- py/client/setup.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/py/client/setup.py b/py/client/setup.py index c4719d404ad..e5224132d17 100644 --- a/py/client/setup.py +++ b/py/client/setup.py @@ -11,11 +11,13 @@ from pkg_resources import parse_version from setuptools import find_packages, setup + def _get_readme() -> str: # The directory containing this file - HERE = pathlib.Path(__file__).parent + here = pathlib.Path(__file__).parent # The text of the README file - return (HERE / "README.md").read_text(encoding="utf-8") + return (here / "README.md").read_text(encoding="utf-8") + def _normalize_version(java_version): partitions = java_version.partition("-") @@ -24,9 +26,11 @@ def _normalize_version(java_version): python_version = f"{regular_version}+{local_segment}" if local_segment else regular_version return str(parse_version(python_version)) + def _compute_version(): return _normalize_version(os.environ['DEEPHAVEN_VERSION']) + setup( name='pydeephaven', version=_compute_version(), @@ -54,6 +58,7 @@ def _compute_version(): install_requires=['pyarrow', 'bitstring', 'grpcio', - 'protobuf'], + 'protobuf', + 'numpy'], package_data={'pydeephaven': ['py.typed']} )