fix: move grpc, proto-plus and protobuf packages to extras (#1721) · googleapis/google-cloud-python@13439b3 · GitHub

googleapis / google-cloud-python Public

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

• Code
• Issues 442
• Pull requests 96
• Discussions
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 13439b3

Browse filesBrowse the repository at this point in the historyBrowse files

authored

fix: move grpc, proto-plus and protobuf packages to extras (#1721)

* chore: move grpc, proto-plus and protobuff packages to extras * formatted with black * feat: add `job_timeout_ms` to job configuration classes (#1675) * fix: adds new property and tests * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * updates docs to correct a sphinx failure * Updates formatting * Update tests/system/test_query.py * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Update google/cloud/bigquery/job/base.py * updates one test and uses int_or_none * Update tests/system/test_query.py testing something. * Update tests/system/test_query.py * testing coverage feature * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * minor edits * tweaks to noxfile for testing purposes * add new test to base as experiment * adds a test, updates import statements * add another test * edit to tests * formatting fixes * update noxfile to correct debug code * removes unneeded comments. --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> --------- Co-authored-by: Chalmer Lowe <chalmerlowe@google.com> Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Tim Swast <swast@google.com>

1 parent e582240 commit 13439b3
Copy full SHA for 13439b3

2 files changed

+13-5Lines changed: 13 additions & 5 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• packages/google-cloud-bigquery
  • setup.py
  • tests/unit
    • test_legacy_types.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎packages/google-cloud-bigquery/setup.py‎

Copy file name to clipboardExpand all lines: packages/google-cloud-bigquery/setup.py

+5-5Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -29,20 +29,16 @@
29	29	# 'Development Status :: 5 - Production/Stable'
30	30	release_status = "Development Status :: 5 - Production/Stable"
31	31	dependencies = [
32		- "grpcio >= 1.47.0, < 2.0dev", # https://github.com/googleapis/python-bigquery/issues/1262
33		- "grpcio >= 1.49.1, < 2.0dev; python_version>='3.11'",
34	32	# NOTE: Maintainers, please do not require google-api-core>=2.x.x
35	33	# Until this issue is closed
36	34	# https://github.com/googleapis/google-cloud-python/issues/10566
37		- "google-api-core[grpc] >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0",
38		- "proto-plus >= 1.15.0, <2.0.0dev",
	35	+ "google-api-core >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0",
39	36	# NOTE: Maintainers, please do not require google-cloud-core>=2.x.x
40	37	# Until this issue is closed
41	38	# https://github.com/googleapis/google-cloud-python/issues/10566
42	39	"google-cloud-core >= 1.6.0, <3.0.0dev",
43	40	"google-resumable-media >= 0.6.0, < 3.0dev",
44	41	"packaging >= 20.0.0",
45		- "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", # For the legacy proto-based types.
46	42	"python-dateutil >= 2.7.2, <3.0dev",
47	43	"requests >= 2.21.0, < 3.0.0dev",
48	44	]
@@ -82,6 +78,10 @@
82	78	"opentelemetry-sdk >= 1.1.0",
83	79	"opentelemetry-instrumentation >= 0.20b0",
84	80	],
	81	+ "bigquery_v2": [
	82	+ "proto-plus >= 1.15.0, <2.0.0dev",
	83	+ "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", # For the legacy proto-based types.
	84	+ ],
85	85	}
86	86
87	87	all_extras = []

Collapse file

‎packages/google-cloud-bigquery/tests/unit/test_legacy_types.py‎

Copy file name to clipboardExpand all lines: packages/google-cloud-bigquery/tests/unit/test_legacy_types.py

+8Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -13,9 +13,17 @@
13	13	# See the License for the specific language governing permissions and
14	14	# limitations under the License.
15	15
	16	+ import pytest
	17	+
16	18	import warnings
17	19
	20	+ try:
	21	+ import proto # type: ignore
	22	+ except ImportError: # pragma: NO COVER
	23	+ proto = None
	24	+
18	25
	26	+ @pytest.mark.skipif(proto is None, reason="proto is not installed")
19	27	def test_importing_legacy_types_emits_warning():
20	28	with warnings.catch_warnings(record=True) as warned:
21	29	from google.cloud.bigquery_v2 import types # noqa: F401

0 commit comments

Comments

0 (0)