forked from ray-project/ray
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update grpc to 1.43 (ray-project#21866)
add patch for newer setuptools, can be removed once grpc 1.44 is release Why are these changes needed? With grpc updated to 1.43, one of the patches is not needed. Patch needed when building locally for newer setuptools version. See grpc/grpc#28392 for more details. Also needed as a prereq to ray-project#21221
- Loading branch information
Showing
3 changed files
with
36 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
diff --git third_party/py/python_configure.bzl third_party/py/python_configure.bzl | ||
--- third_party/py/python_configure.bzl | ||
+++ third_party/py/python_configure.bzl | ||
@@ -199,8 +199,8 @@ def _get_python_lib(repository_ctx, python_bin, lib_path_key): | ||
" python_paths = os.getenv('PYTHONPATH').split(':')\n" + "try:\n" + | ||
" library_paths = site.getsitepackages()\n" + | ||
"except AttributeError:\n" + | ||
- " from distutils.sysconfig import get_python_lib\n" + | ||
- " library_paths = [get_python_lib()]\n" + | ||
+ " import sysconfig\n" + | ||
+ " library_paths = [sysconfig.get_path('purelib')]\n" + | ||
"all_paths = set(python_paths + library_paths)\n" + "paths = []\n" + | ||
"for path in all_paths:\n" + " if os.path.isdir(path):\n" + | ||
" paths.append(path)\n" + "if len(paths) >=1:\n" + | ||
@@ -237,14 +237,13 @@ def _get_python_include(repository_ctx, python_bin): | ||
python_bin, | ||
"-c", | ||
"from __future__ import print_function;" + | ||
- "from distutils import sysconfig;" + | ||
- "print(sysconfig.get_python_inc())", | ||
+ "import sysconfig;" + | ||
+ "print(sysconfig.get_path('include'))", | ||
], | ||
error_msg = "Problem getting python include path for {}.".format(python_bin), | ||
error_details = ( | ||
"Is the Python binary path set up right? " + "(See ./configure or " + | ||
- python_bin + ".) " + "Is distutils installed? " + | ||
- _HEADERS_HELP | ||
+ python_bin + ".) " + _HEADERS_HELP | ||
), | ||
) | ||
include_path = result.stdout.splitlines()[0] |