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", ],