-
-
Notifications
You must be signed in to change notification settings - Fork 14.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
grpc, pythonPackges.grpcio, pythonPackages.grpcio-tools: update to 1.16.1 #50672
Conversation
@GrahamcOfBorg build grpc pythonPackages.grpcio python3Packages.grpcio pythonPackages.grpcio-tools python3Packages.grpcio-tools python3Packages.tensorflow pythonPackages.tensorflow |
Failure on aarch64-linux (full log) Attempted: grpc, pythonPackages.grpcio, python3Packages.grpcio, pythonPackages.grpcio-tools, python3Packages.grpcio-tools, pythonPackages.tensorflow The following builds were skipped because they don't evaluate on aarch64-linux: python3Packages.tensorflow Partial log (click to expand)
|
Failure on x86_64-linux (full log) Attempted: grpc, pythonPackages.grpcio, python3Packages.grpcio, pythonPackages.grpcio-tools, python3Packages.grpcio-tools, pythonPackages.tensorflow The following builds were skipped because they don't evaluate on x86_64-linux: python3Packages.tensorflow Partial log (click to expand)
|
e79e759
to
a61c05f
Compare
I added a commit which applies protocolbuffers/protobuf#4862 to make protobuf compatible with Python 3.7. |
a61c05f
to
eb1bc33
Compare
@GrahamcOfBorg build grpc pythonPackages.grpcio python3Packages.grpcio pythonPackages.grpcio-tools python3Packages.grpcio-tools pythonPackages.protobuf python3Packages.protobuf |
@GrahamcOfBorg build pythonPackages.tensorflow |
Success on x86_64-linux (full log) Attempted: pythonPackages.tensorflow Partial log (click to expand)
|
Success on aarch64-linux (full log) Attempted: grpc, pythonPackages.grpcio, python3Packages.grpcio, pythonPackages.grpcio-tools, python3Packages.grpcio-tools, pythonPackages.protobuf, python3Packages.protobuf Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: grpc, pythonPackages.grpcio, python3Packages.grpcio, pythonPackages.grpcio-tools, python3Packages.grpcio-tools, pythonPackages.protobuf, python3Packages.protobuf Partial log (click to expand)
|
Failure on aarch64-linux (full log) Attempted: pythonPackages.tensorflow Partial log (click to expand)
|
Seems |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All usual checks pass for me. Thanks for picking this up 👍
The protobuf patch introduced here does not apply when using another (older) protobuf (e.g. protobuf_3_1).
(PR incoming) |
Change introduced in NixOS#50672. The patch does not apply on older protobuf like protobuf3_1 ``` $ nix-build -E 'with import ./. { }; python3Packages.protobuf.override { protobuf = protobuf3_1; }' unpacking sources unpacking source archive /nix/store/1zdyl0cxaa8ha2v1zp75zzdjd6j99d0m-source source root is source setting SOURCE_DATE_EPOCH to timestamp 315619200 of file source/util/python/BUILD patching sources applying patch /nix/store/yagx7hvylnnjq7lxbcia0y5lq1r736w3-0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch patching file google/protobuf/pyext/descriptor.cc Hunk #1 succeeded at 55 (offset -1 lines). patching file google/protobuf/pyext/descriptor_containers.cc patching file google/protobuf/pyext/descriptor_pool.cc Hunk #1 succeeded at 47 (offset -1 lines). patching file google/protobuf/pyext/extension_dict.cc Hunk #1 FAILED at 53. 1 out of 1 hunk FAILED -- saving rejects to file google/protobuf/pyext/extension_dict.cc.rej patching file google/protobuf/pyext/message.cc Hunk #1 succeeded at 82 (offset 3 lines). Hunk #2 succeeded at 1425 (offset -104 lines). ``` Since the patch isn't necessary on python versions older than 3.7, let's only apply it for version 3.7. This means that most things using older protobuf implementation will now be able to build when using an older pythonPackage set (as is most probably the case anyway). This still leaves protobuf 3.1 using packages hanging, but the errors will be localized to those that would be breaking anyway with the upgrade to 3.7 as default python.
…g with it Change introduced in NixOS#50672. The patch does not apply on older protobuf like protobuf3_1 ``` $ nix-build -E 'with import ./. { }; python3Packages.protobuf.override { protobuf = protobuf3_1; }' unpacking sources unpacking source archive /nix/store/1zdyl0cxaa8ha2v1zp75zzdjd6j99d0m-source source root is source setting SOURCE_DATE_EPOCH to timestamp 315619200 of file source/util/python/BUILD patching sources applying patch /nix/store/yagx7hvylnnjq7lxbcia0y5lq1r736w3-0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch patching file google/protobuf/pyext/descriptor.cc Hunk #1 succeeded at 55 (offset -1 lines). patching file google/protobuf/pyext/descriptor_containers.cc patching file google/protobuf/pyext/descriptor_pool.cc Hunk #1 succeeded at 47 (offset -1 lines). patching file google/protobuf/pyext/extension_dict.cc Hunk #1 FAILED at 53. 1 out of 1 hunk FAILED -- saving rejects to file google/protobuf/pyext/extension_dict.cc.rej patching file google/protobuf/pyext/message.cc Hunk #1 succeeded at 82 (offset 3 lines). Hunk #2 succeeded at 1425 (offset -104 lines). ``` Since the patch isn't necessary on python versions older than 3.7, let's only apply it for version 3.7. This means that most things using older protobuf implementation will now be able to build when using an older pythonPackage set (as is most probably the case anyway). This still leaves protobuf 3.1 using packages hanging, but the errors will be localized to those that would be breaking anyway with the upgrade to 3.7 as default python.
Motivation for this change
Updates grpc and related packages to 1.16.1:
I removed the grpc dependency from grpcio-tools, because it is not used.
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)