Merge pull request #24267 from lidizheng/fix-macos-enum

Don't install enum34 for non-2.7 Python
pull/24282/head
Lidi Zheng 4 years ago committed by GitHub
commit 32e4c1c1df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      requirements.txt
  2. 5
      src/python/grpcio_tests/setup.py
  3. 2
      tools/internal_ci/helper_scripts/prepare_build_macos_rc
  4. 2
      tools/run_tests/artifacts/build_artifact_python.sh
  5. 4
      tools/run_tests/helper_scripts/build_python.sh

@ -1,7 +1,6 @@
# GRPC Python setup requirements
coverage>=4.0
cython>=0.29.8
enum34>=1.0.4
protobuf>=3.5.0.post1, < 4.0dev
six>=1.10
wheel>=0.29

@ -38,8 +38,7 @@ PACKAGE_DIRECTORIES = {
}
INSTALL_REQUIRES = (
'coverage>=4.0', 'enum34>=1.0.4',
'grpcio>={version}'.format(version=grpc_version.VERSION),
'coverage>=4.0', 'grpcio>={version}'.format(version=grpc_version.VERSION),
'grpcio-channelz>={version}'.format(version=grpc_version.VERSION),
'grpcio-status>={version}'.format(version=grpc_version.VERSION),
'grpcio-tools>={version}'.format(version=grpc_version.VERSION),
@ -48,7 +47,7 @@ INSTALL_REQUIRES = (
'google-auth>=1.17.2', 'requests>=2.14.2')
if not PY3:
INSTALL_REQUIRES += ('futures>=2.2.0',)
INSTALL_REQUIRES += ('futures>=2.2.0', 'enum34>=1.0.4')
COMMAND_CLASS = {
# Run `preprocess` *before* doing any packaging!

@ -89,9 +89,9 @@ then
# python
time pip install --user virtualenv
time pip install --user --upgrade Mako six tox setuptools==44.1.1 twisted pyyaml pyjwt cryptography requests
export PYTHONPATH=/Library/Python/3.4/site-packages
# make sure md5sum is available (requires coreutils 8.31+)
brew update-reset
brew upgrade coreutils
# Install Python 3.7 and Python 3.8

@ -104,7 +104,7 @@ then
if [ "$("$PYTHON" -c "import sys; print(sys.version_info[0])")" == "2" ]
then
"${PIP}" install futures>=2.2.0
"${PIP}" install futures>=2.2.0 enum34>=1.0.4
fi
"${PIP}" install grpcio --no-index --find-links "file://$ARTIFACT_DIR/"

@ -188,11 +188,11 @@ esac
pip_install --upgrade setuptools==44.1.1
pip_install --upgrade pip==19.3.1
pip_install --upgrade cython
pip_install --upgrade six enum34 protobuf
pip_install --upgrade six protobuf
if [ "$("$VENV_PYTHON" -c "import sys; print(sys.version_info[0])")" == "2" ]
then
pip_install futures
pip_install --upgrade futures enum34
fi
pip_install_dir "$ROOT"

Loading…
Cancel
Save