Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add python_requires field to grpcio-* packages (#27495)

Browse Source 
- Update the run_tests.py and distrib tests
- Update the Dockerfiles
reviewable/pr27511/r1
Lidi Zheng 3 years ago committed by GitHub
parent 50a79d62e4
commit 9978223a26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 17 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      setup.py
  2. 1
      src/python/grpcio_admin/setup.py
  3. 1
      src/python/grpcio_channelz/setup.py
  4. 1
      src/python/grpcio_csds/setup.py
  5. 1
      src/python/grpcio_health_checking/setup.py
  6. 1
      src/python/grpcio_reflection/setup.py
  7. 1
      src/python/grpcio_status/setup.py
  8. 1
      tools/distrib/python/grpcio_tools/setup.py
  9. 1
      tools/distrib/python/xds_protos/setup.py
  10. 2
      tools/dockerfile/distribtest/python_dev_buster_x64/Dockerfile
  11. 2
      tools/dockerfile/distribtest/python_dev_buster_x86/Dockerfile
  12. 4
      tools/dockerfile/distribtest/python_dev_fedora34_x64/Dockerfile
  13. 6
      tools/run_tests/artifacts/distribtest_targets.py
  14. 21
      tools/run_tests/run_tests.py

1
setup.py
Unescape View File

@ -536,6 +536,7 @@ setuptools.setup(
packages=list(PACKAGES),
package_dir=PACKAGE_DIRECTORIES,
package_data=PACKAGE_DATA,
python_requires='>=3.6',
install_requires=INSTALL_REQUIRES,
extras_require=EXTRAS_REQUIRES,
setup_requires=SETUP_REQUIRES,

1
src/python/grpcio_admin/setup.py
Unescape View File

@ -55,5 +55,6 @@ setuptools.setup(name='grpcio-admin',
url='https://grpc.io',
package_dir=PACKAGE_DIRECTORIES,
packages=setuptools.find_packages('.'),
python_requires='>=3.6',
install_requires=INSTALL_REQUIRES,
setup_requires=SETUP_REQUIRES)

1
src/python/grpcio_channelz/setup.py
Unescape View File

@ -98,6 +98,7 @@ setuptools.setup(
url='https://grpc.io',
package_dir=PACKAGE_DIRECTORIES,
packages=setuptools.find_packages('.'),
python_requires='>=3.6',
install_requires=INSTALL_REQUIRES,
setup_requires=SETUP_REQUIRES,
cmdclass=COMMAND_CLASS)

1
src/python/grpcio_csds/setup.py
Unescape View File

@ -56,5 +56,6 @@ setuptools.setup(name='grpcio-csds',
url='https://grpc.io',
package_dir=PACKAGE_DIRECTORIES,
packages=setuptools.find_packages('.'),
python_requires='>=3.6',
install_requires=INSTALL_REQUIRES,
setup_requires=SETUP_REQUIRES)

1
src/python/grpcio_health_checking/setup.py
Unescape View File

@ -96,6 +96,7 @@ setuptools.setup(name='grpcio-health-checking',
classifiers=CLASSIFIERS,
package_dir=PACKAGE_DIRECTORIES,
packages=setuptools.find_packages('.'),
python_requires='>=3.6',
install_requires=INSTALL_REQUIRES,
setup_requires=SETUP_REQUIRES,
cmdclass=COMMAND_CLASS)

1
src/python/grpcio_reflection/setup.py
Unescape View File

@ -97,6 +97,7 @@ setuptools.setup(name='grpcio-reflection',
url='https://grpc.io',
package_dir=PACKAGE_DIRECTORIES,
packages=setuptools.find_packages('.'),
python_requires='>=3.6',
install_requires=INSTALL_REQUIRES,
setup_requires=SETUP_REQUIRES,
cmdclass=COMMAND_CLASS)

1
src/python/grpcio_status/setup.py
Unescape View File

@ -94,5 +94,6 @@ setuptools.setup(name='grpcio-status',
classifiers=CLASSIFIERS,
package_dir=PACKAGE_DIRECTORIES,
packages=setuptools.find_packages('.'),
python_requires='>=3.6',
install_requires=INSTALL_REQUIRES,
cmdclass=COMMAND_CLASS)

1
tools/distrib/python/grpcio_tools/setup.py
Unescape View File

@ -288,6 +288,7 @@ setuptools.setup(name='grpcio-tools',
classifiers=CLASSIFIERS,
ext_modules=extension_modules(),
packages=setuptools.find_packages('.'),
python_requires='>=3.6',
install_requires=[
'protobuf>=3.5.0.post1, < 4.0dev',
'grpcio>={version}'.format(version=grpc_version.VERSION),

1
tools/distrib/python/xds_protos/setup.py
Unescape View File

@ -47,6 +47,7 @@ setuptools.setup(
author_email='grpc-io@googlegroups.com',
url='https://grpc.io',
license='Apache License 2.0',
python_requires='>=3.6',
install_requires=INSTALL_REQUIRES,
setup_requires=SETUP_REQUIRES,
classifiers=CLASSIFIERS)

2
tools/dockerfile/distribtest/python_dev_jessie_x64/Dockerfile → tools/dockerfile/distribtest/python_dev_buster_x64/Dockerfile
Unescape View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM debian:jessie
FROM debian:buster
RUN apt-get update && apt-get install -y python3 python3-pip
RUN pip3 install virtualenv==16.7.9

2
tools/dockerfile/distribtest/python_dev_jessie_x86/Dockerfile → tools/dockerfile/distribtest/python_dev_buster_x86/Dockerfile
Unescape View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM i386/debian:jessie
FROM i386/debian:buster
RUN apt-get update && apt-get install -y python3 python3-pip

4
tools/dockerfile/distribtest/python_dev_fedora23_x64/Dockerfile → tools/dockerfile/distribtest/python_dev_fedora34_x64/Dockerfile
Unescape View File

@ -1,4 +1,4 @@
# Copyright 2015 gRPC authors.
# Copyright 2021 The gRPC Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM fedora:23
FROM fedora:34
RUN yum clean all && yum update -y && yum install -y python3 python3-pip
RUN pip3 install virtualenv==16.7.9

6
tools/run_tests/artifacts/distribtest_targets.py
Unescape View File

@ -353,10 +353,10 @@ def targets():
PythonDistribTest('linux', 'x64', 'ubuntu1804'),
PythonDistribTest('linux', 'aarch64', 'python38_buster'),
PythonDistribTest('linux', 'x64', 'alpine3.7', source=True),
PythonDistribTest('linux', 'x64', 'jessie', source=True),
PythonDistribTest('linux', 'x86', 'jessie', source=True),
PythonDistribTest('linux', 'x64', 'buster', source=True),
PythonDistribTest('linux', 'x86', 'buster', source=True),
PythonDistribTest('linux', 'x64', 'centos7', source=True),
PythonDistribTest('linux', 'x64', 'fedora23', source=True),
PythonDistribTest('linux', 'x64', 'fedora34', source=True),
PythonDistribTest('linux', 'x64', 'arch', source=True),
PythonDistribTest('linux', 'x64', 'ubuntu1804', source=True),
# Ruby

21
tools/run_tests/run_tests.py
Unescape View File

@ -675,9 +675,7 @@ class PythonLanguage(object):
def _python_manager_name(self):
"""Choose the docker image to use based on python version."""
if self.args.compiler in [
'python2.7', 'python3.5', 'python3.6', 'python3.7', 'python3.8'
]:
if self.args.compiler in ['python3.6', 'python3.7', 'python3.8']:
return 'stretch_' + self.args.compiler[len('python'):]
elif self.args.compiler == 'python_alpine':
return 'alpine'
@ -729,16 +727,6 @@ class PythonLanguage(object):
builder_prefix_arguments,
venv_relative_python, toolchain, runner,
test_command, args.iomgr_platform)
python27_config = _python_config_generator(name='py27',
major='2',
minor='7',
bits=bits,
config_vars=config_vars)
python35_config = _python_config_generator(name='py35',
major='3',
minor='5',
bits=bits,
config_vars=config_vars)
python36_config = _python_config_generator(name='py36',
major='3',
minor='6',
@ -791,14 +779,9 @@ class PythonLanguage(object):
return (python38_config,)
else:
return (
python35_config,
python37_config,
python38_config,
)
elif args.compiler == 'python2.7':
return (python27_config,)
elif args.compiler == 'python3.5':
return (python35_config,)
elif args.compiler == 'python3.6':
return (python36_config,)
elif args.compiler == 'python3.7':
@ -815,8 +798,6 @@ class PythonLanguage(object):
return (python38_config,)
elif args.compiler == 'all_the_cpythons':
return (
python27_config,
python35_config,
python36_config,
python37_config,
python38_config,

Write Preview
Loading…
Cancel
Save