From 691cea9b7ee5c1aeb25b88eca6a8507dedafcc13 Mon Sep 17 00:00:00 2001 From: Jim Fulton Date: Thu, 19 Aug 2021 13:06:53 -0400 Subject: [PATCH] chore: Update many dependencies: v2 for api-core, cloud-core and auth and bigquery (#282) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency charset-normalizer to v2.0.4 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore(deps): update dependency google-cloud-bigquery-storage to v2.6.3 * chore(deps): update dependency google-resumable-media to v1.3.3 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore(deps): update dependency greenlet to v1.1.1 * chore(deps): update dependency importlib-metadata to v4.6.4 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore(deps): update dependency libcst to v0.3.20 * chore(deps): update dependency pybigquery to v0.10.1 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore(deps): update dependency dataclasses to v0.8 * chore(deps): update dependency google-auth to v1.35.0 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore(deps): update dependency google-cloud-bigquery to v2.24.0 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore(deps): update dependency numpy to v1.21.2 * chore(deps): update dependency pandas to v1.3.2 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore(deps): update dependency pyproj to v3.1.0 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore(deps): update dependency google-auth to v2 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Update requirements.txt * minor sorting * chore(deps): update dependency sqlalchemy to v1.4.23 * Use older pyproj for Python 3.6 * Use older version of pandas for Python 3.6 * Use older numpy for Python 3.6 * Use older dataclasses for Python 3.8 and earlier * Don't need dataclasses for 3.7 and later, as they're in the standard library * chore(deps): update dependency google-api-core to v2 * chore(deps): update dependency google-cloud-core to v2 * require google-cloud-bigquery 2.24.1 (or greater) * Include tests dependencies in noxfile * Include tests dependencies in noxfile for compliance tests Co-authored-by: Renovate Bot Co-authored-by: Owl Bot --- noxfile.py | 18 +++++++++--------- owlbot.py | 12 ++++++------ samples/snippets/requirements.txt | 8 ++++---- setup.py | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/noxfile.py b/noxfile.py index 8404d6d2..823c72c2 100644 --- a/noxfile.py +++ b/noxfile.py @@ -99,11 +99,11 @@ def default(session): ) if session.python == "3.8": - extras = "[alembic]" + extras = "[tests,alembic]" elif session.python == "3.9": - extras = "[geography]" + extras = "[tests,geography]" else: - extras = "" + extras = "[tests]" session.install("-e", f".{extras}", "-c", constraints_path) # Run py.test against the unit tests. @@ -157,11 +157,11 @@ def system(session): # virtualenv's dist-packages. session.install("mock", "pytest", "google-cloud-testutils", "-c", constraints_path) if session.python == "3.8": - extras = "[alembic]" + extras = "[tests,alembic]" elif session.python == "3.9": - extras = "[geography]" + extras = "[tests,geography]" else: - extras = "" + extras = "[tests]" session.install("-e", f".{extras}", "-c", constraints_path) # Run py.test against the system tests. @@ -211,11 +211,11 @@ def compliance(session): constraints_path, ) if session.python == "3.8": - extras = "[alembic]" + extras = "[tests,alembic]" elif session.python == "3.9": - extras = "[geography]" + extras = "[tests,geography]" else: - extras = "" + extras = "[tests]" session.install("-e", f".{extras}", "-c", constraints_path) session.run( diff --git a/owlbot.py b/owlbot.py index 03cc243e..b6cfe7ff 100644 --- a/owlbot.py +++ b/owlbot.py @@ -27,10 +27,10 @@ # ---------------------------------------------------------------------------- # Add templated files # ---------------------------------------------------------------------------- -extras = [] +extras = ["tests"] extras_by_python = { - "3.8": ["alembic"], - "3.9": ["geography"], + "3.8": ["tests", "alembic"], + "3.9": ["tests", "geography"], } templated_files = common.py_library( unit_test_python_versions=["3.6", "3.7", "3.8", "3.9"], @@ -135,11 +135,11 @@ def compliance(session): constraints_path, ) if session.python == "3.8": - extras = "[alembic]" + extras = "[tests,alembic]" elif session.python == "3.9": - extras = "[geography]" + extras = "[tests,geography]" else: - extras = "" + extras = "[tests]" session.install("-e", f".{extras}", "-c", constraints_path) session.run( diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt index 95be528e..48cfb78d 100644 --- a/samples/snippets/requirements.txt +++ b/samples/snippets/requirements.txt @@ -14,11 +14,11 @@ Fiona==1.8.20 future==0.18.2 GeoAlchemy2==0.9.3 geopandas==0.9.0 -google-api-core==1.31.2 -google-auth==1.35.0 -google-cloud-bigquery==2.24.0 +google-api-core==2.0.0 +google-auth==2.0.0 +google-cloud-bigquery==2.24.1 google-cloud-bigquery-storage==2.6.3 -google-cloud-core==1.7.2 +google-cloud-core==2.0.0 google-crc32c==1.1.2 google-resumable-media==1.3.3 googleapis-common-protos==1.53.0 diff --git a/setup.py b/setup.py index 378e3a23..fd8a8acd 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ def readme(): return f.read() -extras = dict(geography=["GeoAlchemy2", "shapely"], alembic=["alembic"],) +extras = dict(geography=["GeoAlchemy2", "shapely"], alembic=["alembic"], tests=["pytz"]) extras["all"] = set(itertools.chain.from_iterable(extras.values())) setup( @@ -79,7 +79,7 @@ def readme(): # Until this issue is closed # https://github.com/googleapis/google-cloud-python/issues/10566 "google-auth>=1.25.0,<3.0.0dev", # Work around pip wack. - "google-cloud-bigquery>=2.19.0", + "google-cloud-bigquery>=2.24.1", "sqlalchemy>=1.2.0,<1.5.0dev", "future", ],