Merge pull request #17752 from grpc/license-symlinks

Stop copying LICENSE files

src/python/grpcio_channelz/LICENSE

@@ -0,0 +1 @@
+../../../LICENSE

src/python/grpcio_channelz/channelz_commands.py

@@ -21,7 +21,6 @@ import setuptools
 ROOT_DIR = os.path.abspath(os.path.dirname(os.path.abspath(__file__)))
 CHANNELZ_PROTO = os.path.join(ROOT_DIR,
                               '../../proto/grpc/channelz/channelz.proto')
-LICENSE = os.path.join(ROOT_DIR, '../../../LICENSE')
 
 
 class Preprocess(setuptools.Command):
@@ -42,8 +41,6 @@ class Preprocess(setuptools.Command):
             shutil.copyfile(CHANNELZ_PROTO,
                             os.path.join(ROOT_DIR,
                                          'grpc_channelz/v1/channelz.proto'))
-        if os.path.isfile(LICENSE):
-            shutil.copyfile(LICENSE, os.path.join(ROOT_DIR, 'LICENSE'))
 
 
 class BuildPackageProtos(setuptools.Command):

src/python/grpcio_health_checking/LICENSE

@@ -0,0 +1 @@
+../../../LICENSE

src/python/grpcio_health_checking/health_commands.py

@@ -20,7 +20,6 @@ import setuptools
 
 ROOT_DIR = os.path.abspath(os.path.dirname(os.path.abspath(__file__)))
 HEALTH_PROTO = os.path.join(ROOT_DIR, '../../proto/grpc/health/v1/health.proto')
-LICENSE = os.path.join(ROOT_DIR, '../../../LICENSE')
 
 
 class Preprocess(setuptools.Command):
@@ -41,8 +40,6 @@ class Preprocess(setuptools.Command):
             shutil.copyfile(HEALTH_PROTO,
                             os.path.join(ROOT_DIR,
                                          'grpc_health/v1/health.proto'))
-        if os.path.isfile(LICENSE):
-            shutil.copyfile(LICENSE, os.path.join(ROOT_DIR, 'LICENSE'))
 
 
 class BuildPackageProtos(setuptools.Command):

src/python/grpcio_reflection/LICENSE

@@ -0,0 +1 @@
+../../../LICENSE

src/python/grpcio_reflection/reflection_commands.py

@@ -21,7 +21,6 @@ import setuptools
 ROOT_DIR = os.path.abspath(os.path.dirname(os.path.abspath(__file__)))
 REFLECTION_PROTO = os.path.join(
     ROOT_DIR, '../../proto/grpc/reflection/v1alpha/reflection.proto')
-LICENSE = os.path.join(ROOT_DIR, '../../../LICENSE')
 
 
 class Preprocess(setuptools.Command):
@@ -43,8 +42,6 @@ class Preprocess(setuptools.Command):
                 REFLECTION_PROTO,
                 os.path.join(ROOT_DIR,
                              'grpc_reflection/v1alpha/reflection.proto'))
-        if os.path.isfile(LICENSE):
-            shutil.copyfile(LICENSE, os.path.join(ROOT_DIR, 'LICENSE'))
 
 
 class BuildPackageProtos(setuptools.Command):

src/python/grpcio_status/LICENSE

@@ -0,0 +1 @@
+../../../LICENSE

src/python/grpcio_status/setup.py

@@ -63,20 +63,11 @@ INSTALL_REQUIRES = (
     'googleapis-common-protos>=1.5.5',
 )
 
-try:
-    import status_commands as _status_commands
-    # we are in the build environment, otherwise the above import fails
-    COMMAND_CLASS = {
-        # Run preprocess from the repository *before* doing any packaging!
-        'preprocess': _status_commands.Preprocess,
-        'build_package_protos': _NoOpCommand,
-    }
-except ImportError:
-    COMMAND_CLASS = {
-        # wire up commands to no-op not to break the external dependencies
-        'preprocess': _NoOpCommand,
-        'build_package_protos': _NoOpCommand,
-    }
+COMMAND_CLASS = {
+    # wire up commands to no-op not to break the external dependencies
+    'preprocess': _NoOpCommand,
+    'build_package_protos': _NoOpCommand,
+}
 
 setuptools.setup(
     name='grpcio-status',

src/python/grpcio_status/status_commands.py

@@ -1,39 +0,0 @@
-# Copyright 2018 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.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""Provides distutils command classes for the GRPC Python setup process."""
-
-import os
-import shutil
-
-import setuptools
-
-ROOT_DIR = os.path.abspath(os.path.dirname(os.path.abspath(__file__)))
-LICENSE = os.path.join(ROOT_DIR, '../../../LICENSE')
-
-
-class Preprocess(setuptools.Command):
-    """Command to copy LICENSE from root directory."""
-
-    description = ''
-    user_options = []
-
-    def initialize_options(self):
-        pass
-
-    def finalize_options(self):
-        pass
-
-    def run(self):
-        if os.path.isfile(LICENSE):
-            shutil.copyfile(LICENSE, os.path.join(ROOT_DIR, 'LICENSE'))

src/python/grpcio_testing/LICENSE

@@ -0,0 +1 @@
+../../../LICENSE

src/python/grpcio_testing/setup.py

@@ -50,18 +50,10 @@ INSTALL_REQUIRES = (
     'grpcio>={version}'.format(version=grpc_version.VERSION),
 )
 
-try:
-    import testing_commands as _testing_commands
-    # we are in the build environment, otherwise the above import fails
-    COMMAND_CLASS = {
-        # Run preprocess from the repository *before* doing any packaging!
-        'preprocess': _testing_commands.Preprocess,
-    }
-except ImportError:
-    COMMAND_CLASS = {
-        # wire up commands to no-op not to break the external dependencies
-        'preprocess': _NoOpCommand,
-    }
+COMMAND_CLASS = {
+    # wire up commands to no-op not to break the external dependencies
+    'preprocess': _NoOpCommand,
+}
 
 setuptools.setup(
     name='grpcio-testing',

src/python/grpcio_testing/testing_commands.py

@@ -1,39 +0,0 @@
-# Copyright 2018 gRPC Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""Provides distutils command classes for the GRPC Python setup process."""
-
-import os
-import shutil
-
-import setuptools
-
-ROOT_DIR = os.path.abspath(os.path.dirname(os.path.abspath(__file__)))
-LICENSE = os.path.join(ROOT_DIR, '../../../LICENSE')
-
-
-class Preprocess(setuptools.Command):
-    """Command to copy LICENSE from root directory."""
-
-    description = ''
-    user_options = []
-
-    def initialize_options(self):
-        pass
-
-    def finalize_options(self):
-        pass
-
-    def run(self):
-        if os.path.isfile(LICENSE):
-            shutil.copyfile(LICENSE, os.path.join(ROOT_DIR, 'LICENSE'))

tools/distrib/yapf_code.sh

@@ -54,7 +54,7 @@ else
 	tempdir=$(mktemp -d)
 	cp -RT "${dir}" "${tempdir}"
 	yapf "${tempdir}"
-	diff -x '*.pyc' -ru "${dir}" "${tempdir}" || ok=no
+	diff -x 'LICENSE' -x '*.pyc' -ru "${dir}" "${tempdir}" || ok=no
 	rm -rf "${tempdir}"
     done
     if [[ ${ok} == no ]]; then