From 5823c705ffd5d30d99ea75926bcda4e596739389 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Tue, 25 Aug 2020 14:28:24 -0700 Subject: [PATCH 1/2] Re-add fix that somehow was lost pushing back to Piper. --- benchmarks/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/README.md b/benchmarks/README.md index 436c148a34d0..76788175c656 100644 --- a/benchmarks/README.md +++ b/benchmarks/README.md @@ -135,7 +135,7 @@ $ make go ### PHP -We have two version of php protobuf implemention: pure php, php with c extension. To run these version benchmark, you need to: +We have two version of php protobuf implementation: pure php, php with c extension. To run these version benchmark, you need to: #### Pure PHP ``` $ make php From c514e8e62ca377e9fb5807c0e03668fca5d760a8 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Tue, 25 Aug 2020 14:42:47 -0700 Subject: [PATCH 2/2] Re-add change that was somehow lost. --- python/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/setup.py b/python/setup.py index 902f1f4b76e0..d29ff22820b7 100755 --- a/python/setup.py +++ b/python/setup.py @@ -292,6 +292,7 @@ def get_option_from_sys_argv(option_str): 'build_py': build_py, 'test_conformance': test_conformance, }, + setup_requires = ['wheel'], install_requires=install_requires, ext_modules=ext_module_list, )