From ff92cee10bcae7533b573368f448e782fbd43f39 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Fri, 17 Jul 2020 10:31:01 -0700 Subject: [PATCH] Fixed release.sh and setup.py for Python Newer versions of virtualenv lack the --no-site-packages option, so I had to remove it to keep the release.sh script working. I read that this option has already been the default for a long time, so removing it shouldn't chany any behavior. For the setup.py script, I was getting some errors about the bdist_wheel argument to setup.py, but I was able to fix that by adding 'wheel' to setup_requires. --- python/release.sh | 2 +- python/setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/python/release.sh b/python/release.sh index c915e124d8..21745aad79 100755 --- a/python/release.sh +++ b/python/release.sh @@ -11,7 +11,7 @@ function run_install_test() { local PYTHON=$2 local PYPI=$3 - virtualenv --no-site-packages -p `which $PYTHON` test-venv + virtualenv -p `which $PYTHON` test-venv # Intentionally put a broken protoc in the path to make sure installation # doesn't require protoc installed. diff --git a/python/setup.py b/python/setup.py index 0a8d335090..cd66d6c773 100755 --- a/python/setup.py +++ b/python/setup.py @@ -279,6 +279,7 @@ if __name__ == '__main__': 'build_py': build_py, 'test_conformance': test_conformance, }, + setup_requires = ['wheel'], install_requires=install_requires, ext_modules=ext_module_list, )