diff options
Diffstat (limited to 'tools/distrib')
| -rwxr-xr-x | tools/distrib/check_copyright.py | 3 | ||||
| -rwxr-xr-x | tools/distrib/pylint_code.sh | 15 | ||||
| -rwxr-xr-x | tools/distrib/python/docgen.py | 2 | ||||
| -rw-r--r-- | tools/distrib/python/grpcio_tools/grpc_version.py | 2 | ||||
| -rw-r--r-- | tools/distrib/python/grpcio_tools/protoc_lib_deps.py | 2 |
5 files changed, 17 insertions, 7 deletions
diff --git a/tools/distrib/check_copyright.py b/tools/distrib/check_copyright.py index e7893a1fd5..66acc733e5 100755 --- a/tools/distrib/check_copyright.py +++ b/tools/distrib/check_copyright.py @@ -93,8 +93,9 @@ _EXEMPT = frozenset(( # status.proto copied from googleapis 'src/proto/grpc/status/status.proto', - # Gradle wrapper used to build for Android + # Gradle wrappers used to build for Android 'examples/android/helloworld/gradlew.bat', + 'src/android/test/interop/gradlew.bat', )) RE_YEAR = r'Copyright (?P<first_year>[0-9]+\-)?(?P<last_year>[0-9]+) gRPC authors.' diff --git a/tools/distrib/pylint_code.sh b/tools/distrib/pylint_code.sh index bbacd48737..013b6660eb 100755 --- a/tools/distrib/pylint_code.sh +++ b/tools/distrib/pylint_code.sh @@ -25,15 +25,24 @@ DIRS=( 'src/python/grpcio_testing/grpc_testing' ) +TEST_DIRS=( + 'src/python/grpcio_tests/tests' +) + VIRTUALENV=python_pylint_venv +python -m virtualenv $VIRTUALENV + +PYTHON=$VIRTUALENV/bin/python -virtualenv $VIRTUALENV -PYTHON=$(realpath $VIRTUALENV/bin/python) -$PYTHON -m pip install --upgrade pip==9.0.2 +$PYTHON -m pip install --upgrade pip==10.0.1 $PYTHON -m pip install pylint==1.6.5 for dir in "${DIRS[@]}"; do $PYTHON -m pylint --rcfile=.pylintrc -rn "$dir" || exit $? done +for dir in "${TEST_DIRS[@]}"; do + $PYTHON -m pylint --rcfile=.pylintrc-tests -rn "$dir" || exit $? +done + exit 0 diff --git a/tools/distrib/python/docgen.py b/tools/distrib/python/docgen.py index 4d6fcb5d65..732d948bbc 100755 --- a/tools/distrib/python/docgen.py +++ b/tools/distrib/python/docgen.py @@ -70,7 +70,7 @@ subprocess_arguments_list = [ 'env': environment }, { - 'args': [VIRTUALENV_PIP_PATH, 'install', '--upgrade', 'pip==9.0.1'], + 'args': [VIRTUALENV_PIP_PATH, 'install', '--upgrade', 'pip==10.0.1'], 'env': environment }, { diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py index 67716c6e4a..e71f836f6d 100644 --- a/tools/distrib/python/grpcio_tools/grpc_version.py +++ b/tools/distrib/python/grpcio_tools/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! -VERSION = '1.11.0' +VERSION = '1.12.0.dev0' diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py index 2c65fca628..a0e1419ac1 100644 --- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py +++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py @@ -20,4 +20,4 @@ PROTO_FILES=['google/protobuf/wrappers.proto', 'google/protobuf/type.proto', 'go CC_INCLUDE='third_party/protobuf/src' PROTO_INCLUDE='third_party/protobuf/src' -PROTOBUF_SUBMODULE_VERSION="2761122b810fe8861004ae785cc3ab39f384d342" +PROTOBUF_SUBMODULE_VERSION="b5fbb742af122b565925987e65c08957739976a7" |