Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .kokoro/presubmit/prerelease-deps-3.8.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# Only run this nox session.
env_vars: {
key: "NOX_SESSION"
value: "prerelease_deps"
}
value: "prerelease_deps-3.8"
}
7 changes: 7 additions & 0 deletions .kokoro/presubmit/snippets-3.10.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Only run this nox session.
env_vars: {
key: "NOX_SESSION"
value: "snippets-3.10"
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# Only run this nox session.
env_vars: {
key: "NOX_SESSION"
value: "snippets-2.7"
value: "system-3.10"
}
17 changes: 13 additions & 4 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
BLACK_PATHS = ("docs", "google", "samples", "tests", "noxfile.py", "setup.py")

DEFAULT_PYTHON_VERSION = "3.8"
SYSTEM_TEST_PYTHON_VERSIONS = ["3.8"]
UNIT_TEST_PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9"]
SYSTEM_TEST_PYTHON_VERSIONS = ["3.8", "3.10"]
UNIT_TEST_PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9", "3.10"]
CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()

# 'docfx' is excluded since it only needs to run in 'docs-presubmit'
Expand Down Expand Up @@ -69,7 +69,12 @@ def default(session, install_extras=True):
constraints_path,
)

install_target = ".[all]" if install_extras else "."
if install_extras and session.python == "3.10":
install_target = ".[bqstorage,pandas,tqdm,opentelemetry]"
elif install_extras:
install_target = ".[all]"
else:
install_target = "."
session.install("-e", install_target, "-c", constraints_path)

session.install("ipython", "-c", constraints_path)
Expand Down Expand Up @@ -153,7 +158,11 @@ def system(session):
# Data Catalog needed for the column ACL test with a real Policy Tag.
session.install("google-cloud-datacatalog", "-c", constraints_path)

session.install("-e", ".[all]", "-c", constraints_path)
if session.python == "3.10":
extras = "[bqstorage,pandas,tqdm,opentelemetry]"
else:
extras = "[all]"
session.install("-e", f".{extras}", "-c", constraints_path)
session.install("ipython", "-c", constraints_path)

# Run py.test against the system tests.
Expand Down
7 changes: 6 additions & 1 deletion samples/geography/noxfile_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@

TEST_CONFIG_OVERRIDE = {
# You can opt out from the test for specific Python versions.
"ignored_versions": ["2.7"],
"ignored_versions": [
"2.7",
# TODO: Enable 3.10 once there is a geopandas/fiona release.
# https://github.com/Toblerity/Fiona/issues/1043
"3.10",
],
# An envvar key for determining the project id to use. Change it
# to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a
# build specific Cloud project. You can also use your own string
Expand Down
8 changes: 3 additions & 5 deletions samples/geography/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,12 @@ importlib-metadata==4.8.1
libcst==0.3.21
munch==2.5.0
mypy-extensions==0.4.3
numpy==1.19.5; python_version < "3.7"
numpy==1.21.2; python_version > "3.6"
packaging==21.0
pandas==1.1.5; python_version < '3.7'
pandas==1.3.2; python_version >= '3.7'
pandas==1.3.4; python_version >= '3.7'
proto-plus==1.19.2
protobuf==3.18.0
pyarrow==5.0.0
pyarrow==6.0.0
pyasn1==0.4.8
pyasn1-modules==0.2.8
pycparser==2.20
Expand All @@ -43,7 +41,7 @@ pytz==2021.1
PyYAML==5.4.1
requests==2.26.0
rsa==4.7.2
Shapely==1.7.1
Shapely==1.8.0
six==1.16.0
typing-extensions==3.10.0.2
typing-inspect==0.7.1
Expand Down
9 changes: 4 additions & 5 deletions samples/magics/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
google-cloud-bigquery==2.27.1
google-cloud-bigquery-storage==2.9.0
google-auth-oauthlib==0.4.6
grpcio==1.41.0
ipython==7.16.1; python_version < '3.7'
ipython==7.17.0; python_version >= '3.7'
ipython==7.29.0; python_version >= '3.7'
matplotlib==3.3.4; python_version < '3.7'
matplotlib==3.4.1; python_version >= '3.7'
matplotlib==3.5.0rc1; python_version >= '3.7'
pandas==1.1.5; python_version < '3.7'
pandas==1.3.2; python_version >= '3.7'
pyarrow==5.0.0
pandas==1.3.4; python_version >= '3.7'
pyarrow==6.0.0
pytz==2021.1
7 changes: 3 additions & 4 deletions samples/snippets/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
google-cloud-bigquery==2.27.1
google-cloud-bigquery-storage==2.9.0
google-auth-oauthlib==0.4.6
grpcio==1.41.0
ipython==7.16.1; python_version < '3.7'
ipython==7.17.0; python_version >= '3.7'
ipython==7.29.0; python_version >= '3.7'
matplotlib==3.3.4; python_version < '3.7'
matplotlib==3.4.1; python_version >= '3.7'
pandas==1.1.5; python_version < '3.7'
pandas==1.3.2; python_version >= '3.7'
pyarrow==5.0.0
pandas==1.3.4; python_version >= '3.7'
pyarrow==6.0.0
pytz==2021.1
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
]
+ pyarrow_dep,
"geopandas": ["geopandas>=0.9.0, <1.0dev", "Shapely>=1.6.0, <2.0dev"],
"pandas": ["pandas>=0.23.0"] + pyarrow_dep,
"pandas": ["pandas>=0.24.2"] + pyarrow_dep,
"bignumeric_type": pyarrow_dep,
"tqdm": ["tqdm >= 4.7.4, <5.0.0dev"],
"opentelemetry": [
Expand Down Expand Up @@ -127,6 +127,7 @@
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Operating System :: OS Independent",
"Topic :: Internet",
],
Expand All @@ -135,7 +136,7 @@
namespace_packages=namespaces,
install_requires=dependencies,
extras_require=extras,
python_requires=">=3.6, <3.10",
python_requires=">=3.6, <3.11",
include_package_data=True,
zip_safe=False,
)