Skip to content

Commit 3f8e15e

Browse files
authored
Merge pull request grpc#17752 from grpc/license-symlinks
Stop copying LICENSE files
2 parents a866212 + 140e518 commit 3f8e15e

File tree

13 files changed

+15
-114
lines changed

13 files changed

+15
-114
lines changed

src/python/grpcio_channelz/LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../LICENSE

src/python/grpcio_channelz/channelz_commands.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
ROOT_DIR = os.path.abspath(os.path.dirname(os.path.abspath(__file__)))
2222
CHANNELZ_PROTO = os.path.join(ROOT_DIR,
2323
'../../proto/grpc/channelz/channelz.proto')
24-
LICENSE = os.path.join(ROOT_DIR, '../../../LICENSE')
2524

2625

2726
class Preprocess(setuptools.Command):
@@ -42,8 +41,6 @@ def run(self):
4241
shutil.copyfile(CHANNELZ_PROTO,
4342
os.path.join(ROOT_DIR,
4443
'grpc_channelz/v1/channelz.proto'))
45-
if os.path.isfile(LICENSE):
46-
shutil.copyfile(LICENSE, os.path.join(ROOT_DIR, 'LICENSE'))
4744

4845

4946
class BuildPackageProtos(setuptools.Command):
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../LICENSE

src/python/grpcio_health_checking/health_commands.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
ROOT_DIR = os.path.abspath(os.path.dirname(os.path.abspath(__file__)))
2222
HEALTH_PROTO = os.path.join(ROOT_DIR, '../../proto/grpc/health/v1/health.proto')
23-
LICENSE = os.path.join(ROOT_DIR, '../../../LICENSE')
2423

2524

2625
class Preprocess(setuptools.Command):
@@ -41,8 +40,6 @@ def run(self):
4140
shutil.copyfile(HEALTH_PROTO,
4241
os.path.join(ROOT_DIR,
4342
'grpc_health/v1/health.proto'))
44-
if os.path.isfile(LICENSE):
45-
shutil.copyfile(LICENSE, os.path.join(ROOT_DIR, 'LICENSE'))
4643

4744

4845
class BuildPackageProtos(setuptools.Command):

src/python/grpcio_reflection/LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../LICENSE

src/python/grpcio_reflection/reflection_commands.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
ROOT_DIR = os.path.abspath(os.path.dirname(os.path.abspath(__file__)))
2222
REFLECTION_PROTO = os.path.join(
2323
ROOT_DIR, '../../proto/grpc/reflection/v1alpha/reflection.proto')
24-
LICENSE = os.path.join(ROOT_DIR, '../../../LICENSE')
2524

2625

2726
class Preprocess(setuptools.Command):
@@ -43,8 +42,6 @@ def run(self):
4342
REFLECTION_PROTO,
4443
os.path.join(ROOT_DIR,
4544
'grpc_reflection/v1alpha/reflection.proto'))
46-
if os.path.isfile(LICENSE):
47-
shutil.copyfile(LICENSE, os.path.join(ROOT_DIR, 'LICENSE'))
4845

4946

5047
class BuildPackageProtos(setuptools.Command):

src/python/grpcio_status/LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../LICENSE

src/python/grpcio_status/setup.py

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,11 @@ def run(self):
6363
'googleapis-common-protos>=1.5.5',
6464
)
6565

66-
try:
67-
import status_commands as _status_commands
68-
# we are in the build environment, otherwise the above import fails
69-
COMMAND_CLASS = {
70-
# Run preprocess from the repository *before* doing any packaging!
71-
'preprocess': _status_commands.Preprocess,
72-
'build_package_protos': _NoOpCommand,
73-
}
74-
except ImportError:
75-
COMMAND_CLASS = {
76-
# wire up commands to no-op not to break the external dependencies
77-
'preprocess': _NoOpCommand,
78-
'build_package_protos': _NoOpCommand,
79-
}
66+
COMMAND_CLASS = {
67+
# wire up commands to no-op not to break the external dependencies
68+
'preprocess': _NoOpCommand,
69+
'build_package_protos': _NoOpCommand,
70+
}
8071

8172
setuptools.setup(
8273
name='grpcio-status',

src/python/grpcio_status/status_commands.py

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/python/grpcio_testing/LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../LICENSE

0 commit comments

Comments
 (0)