Merge pull request #20870 from lidizheng/win-3.6

Make Windows test gRPC with Python 3.6
pull/20824/head
Lidi Zheng 5 years ago committed by GitHub
commit 814fd36459
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      src/python/grpcio_tests/commands.py
  2. 2
      tools/run_tests/helper_scripts/build_python.sh
  3. 4
      tools/run_tests/run_tests.py

@ -188,6 +188,7 @@ class TestGevent(setuptools.Command):
'unit._cython._channel_test.ChannelTest.test_negative_deadline_connectivity', 'unit._cython._channel_test.ChannelTest.test_negative_deadline_connectivity',
# TODO(https://github.com/grpc/grpc/issues/15411) enable this test # TODO(https://github.com/grpc/grpc/issues/15411) enable this test
'unit._local_credentials_test.LocalCredentialsTest', 'unit._local_credentials_test.LocalCredentialsTest',
'testing._time_test.StrictRealTimeTest',
) )
BANNED_WINDOWS_TESTS = ( BANNED_WINDOWS_TESTS = (
# TODO(https://github.com/grpc/grpc/pull/15411) enable this test # TODO(https://github.com/grpc/grpc/pull/15411) enable this test

@ -166,7 +166,7 @@ pip_install_dir() {
} }
case "$VENV" in case "$VENV" in
*py35_gevent*) *py36_gevent*)
# TODO(https://github.com/grpc/grpc/issues/15411) unpin this # TODO(https://github.com/grpc/grpc/issues/15411) unpin this
$VENV_PYTHON -m pip install gevent==1.3.b1 $VENV_PYTHON -m pip install gevent==1.3.b1
;; ;;

@ -872,7 +872,7 @@ class PythonLanguage(object):
if args.compiler == 'default': if args.compiler == 'default':
if os.name == 'nt': if os.name == 'nt':
return (python35_config,) return (python36_config,)
else: else:
if args.iomgr_platform == 'asyncio': if args.iomgr_platform == 'asyncio':
return (python36_config,) return (python36_config,)
@ -907,7 +907,7 @@ class PythonLanguage(object):
python35_config, python35_config,
python36_config, python36_config,
python37_config, python37_config,
# TODO: Add Python 3.8 once it's released. python38_config,
) )
else: else:
raise Exception('Compiler %s not supported.' % args.compiler) raise Exception('Compiler %s not supported.' % args.compiler)

Loading…
Cancel
Save