[wheel][cpp] recover cpp extra (ray-project#18597)

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):

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