From 237a2ade76e1737ec31c26c9a7278f32b483c2f9 Mon Sep 17 00:00:00 2001 From: Guyang Song Date: Thu, 23 Sep 2021 12:10:03 +0800 Subject: [PATCH] [wheel][cpp] recover cpp extra (#18597) --- python/setup.py | 7 ++++++- release/util/pip_download_test.sh | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/python/setup.py b/python/setup.py index 8dbfea1de3e5b..62d1e4e36fa46 100644 --- a/python/setup.py +++ b/python/setup.py @@ -114,6 +114,11 @@ def get_packages(self): setup_spec = SetupSpec( SetupType.RAY, "ray", "Ray provides a simple, " "universal API for building distributed applications.", BUILD_TYPE) + RAY_EXTRA_CPP = True + # Disable extra cpp for the development versions. + if "dev" in setup_spec.version or os.getenv( + "RAY_DISABLE_EXTRA_CPP") == "1": + RAY_EXTRA_CPP = False # Ideally, we could include these files by putting them in a # MANIFEST.in or using the package_data argument to setup, but the @@ -200,7 +205,7 @@ def get_packages(self): ], } - if os.getenv("RAY_EXTRA_CPP") == "1": + if RAY_EXTRA_CPP: setup_spec.extras["cpp"] = ["ray-cpp==" + setup_spec.version] if sys.version_info >= (3, 7, 0): diff --git a/release/util/pip_download_test.sh b/release/util/pip_download_test.sh index 136b460a0973d..6ab91732ab255 100755 --- a/release/util/pip_download_test.sh +++ b/release/util/pip_download_test.sh @@ -44,7 +44,8 @@ do echo "=========================================================" printf "\n\n\n" - pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple ray=="${RAY_VERSION}" ray—cpp=="${RAY_VERSION}" + # shellcheck disable=SC2102 + pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple ray[cpp]=="${RAY_VERSION}" failed=false cpp_failed=false