Removing `googleapis-common-protos` from deps in non-`core` packages.… · googleapis/google-cloud-python@d3ef455 · GitHub

googleapis / google-cloud-python Public

• Notifications You must be signed in to change notification settings
• Fork 1.8k
• Star 5.4k

• Code
• Issues 444
• Pull requests 99
• Discussions
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit d3ef455

Browse filesBrowse the repository at this point in the historyBrowse files

dhermes

authored

Removing googleapis-common-protos from deps in non-core packages. (#4098)

* Removing `googleapis-common-protos` from deps in non-`core` packages. Also - removing `grpcio` from non-`core` packages. - manually specifying the `grpcio` dep in core (rather than getting it from `googleapis-common-protos[grpc]`) * Making `grpc` an extra for `core`. * Adding `googleapis-common-protos` back to `videointelligence`.

1 parent 9fddaf0 commit d3ef455
Copy full SHA for d3ef455

9 files changed

+10-16Lines changed: 10 additions & 16 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• core
  • setup.py
• language
  • setup.py
• logging
  • setup.py
• pubsub
  • setup.py
• spanner
  • setup.py
• speech
  • setup.py
• trace
  • setup.py
• videointelligence
  • setup.py
• vision
  • setup.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎core/setup.py‎

Copy file name to clipboardExpand all lines: core/setup.py

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -51,7 +51,7 @@
51	51
52	52
53	53	REQUIREMENTS = [
54		- 'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev',
	54	+ 'googleapis-common-protos >= 1.5.3, < 2.0dev',
55	55	'protobuf >= 3.0.0',
56	56	'google-auth >= 0.4.0, < 2.0.0dev',
57	57	'requests >= 2.18.0, < 3.0.0dev',
@@ -61,6 +61,7 @@
61	61
62	62	EXTRAS_REQUIREMENTS = {
63	63	':python_version<"3.2"': ['futures >= 3.0.0'],
	64	+ 'grpc': ['grpcio >= 1.2.0, < 1.6dev'],
64	65	}
65	66
66	67	setup(

Collapse file

‎language/setup.py‎

Copy file name to clipboardExpand all lines: language/setup.py

+1-2Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -51,9 +51,8 @@
51	51
52	52
53	53	REQUIREMENTS = [
54		- 'google-cloud-core >= 0.27.0, < 0.28dev',
	54	+ 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',
55	55	'google-gax >= 0.15.14, < 0.16dev',
56		- 'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev',
57	56	]
58	57	EXTRAS_REQUIRE = {
59	58	':python_version<"3.4"': ['enum34'],

Collapse file

‎logging/setup.py‎

Copy file name to clipboardExpand all lines: logging/setup.py

+1-2Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -51,8 +51,7 @@
51	51
52	52
53	53	REQUIREMENTS = [
54		- 'google-cloud-core >= 0.27.0, < 0.28dev',
55		- 'grpcio >= 1.2.0, < 1.6dev',
	54	+ 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',
56	55	'gapic-google-cloud-logging-v2 >= 0.91.0, < 0.92dev',
57	56	]
58	57

Collapse file

‎pubsub/setup.py‎

Copy file name to clipboardExpand all lines: pubsub/setup.py

+1-3Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -51,11 +51,9 @@
51	51
52	52
53	53	REQUIREMENTS = [
54		- 'google-cloud-core >= 0.27.0, < 0.28dev',
	54	+ 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',
55	55	'google-gax >= 0.15.13, < 0.16dev',
56		- 'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev',
57	56	'grpc-google-iam-v1 >= 0.11.1, < 0.12dev',
58		- 'grpcio >= 1.2.0, < 1.6dev',
59	57	'psutil >= 5.2.2, < 6.0dev',
60	58	]
61	59

Collapse file

‎spanner/setup.py‎

Copy file name to clipboardExpand all lines: spanner/setup.py

+1-2Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -52,9 +52,8 @@
52	52
53	53	REQUIREMENTS = [
54	54	'google-auth >= 1.1.0',
55		- 'google-cloud-core >= 0.27.0, < 0.28dev',
	55	+ 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',
56	56	'google-gax>=0.15.15, <0.16dev',
57		- 'googleapis-common-protos[grpc]>=1.5.3, <2.0dev',
58	57	'grpc-google-iam-v1>=0.11.4, <0.12dev',
59	58	'requests>=2.18.4, <3.0dev',
60	59	]

Collapse file

‎speech/setup.py‎

Copy file name to clipboardExpand all lines: speech/setup.py

+1-2Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -52,9 +52,8 @@
52	52	}
53	53
54	54	REQUIREMENTS = [
55		- 'google-cloud-core >= 0.27.0, < 0.28dev',
	55	+ 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',
56	56	'google-gax >= 0.15.14, < 0.16dev',
57		- 'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev',
58	57	]
59	58
60	59	setup(

Collapse file

‎trace/setup.py‎

Copy file name to clipboardExpand all lines: trace/setup.py

+1-2Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -9,8 +9,7 @@
9	9
10	10	install_requires = [
11	11	'google-gax>=0.15.7, <0.16dev',
12		- 'googleapis-common-protos[grpc]>=1.5.3, <2.0dev',
13		- 'google-cloud-core >= 0.27.0, < 0.28dev',
	12	+ 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',
14	13	]
15	14
16	15	setup(

Collapse file

‎videointelligence/setup.py‎

Copy file name to clipboardExpand all lines: videointelligence/setup.py

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -40,6 +40,7 @@
40	40	install_requires=(
41	41	'googleapis-common-protos >= 1.5.3, < 2.0dev',
42	42	'google-gax >= 0.15.14, < 0.16dev',
	43	+ 'grpcio >= 1.2.0, < 1.6dev',
43	44	'six >= 1.10.0',
44	45	),
45	46	url='https://github.com/GoogleCloudPlatform/google-cloud-python',

Collapse file

‎vision/setup.py‎

Copy file name to clipboardExpand all lines: vision/setup.py

+1-2Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -25,9 +25,8 @@
25	25	readme = readme_file.read()
26	26
27	27	REQUIREMENTS = [
28		- 'google-cloud-core >= 0.27.0, < 0.28dev',
	28	+ 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',
29	29	'google-gax >= 0.15.14, < 0.16dev',
30		- 'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev',
31	30	]
32	31	EXTRAS_REQUIRE = {
33	32	':python_version<"3.4"': ['enum34'],

0 commit comments

Comments

0 (0)