Skip to content

Commit

Permalink
feat: Enable support for 3.10 (#381)
Browse files Browse the repository at this point in the history
requirements{,-test}.txt are clean up to remove things that are not
needed for tests to pass and to include newer versions of dependencies.

Co-authored-by: Tim Swast <swast@google.com>
  • Loading branch information
aucampia and tswast committed Dec 30, 2021
1 parent b5a55ab commit 4b3505b
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 54 deletions.
8 changes: 4 additions & 4 deletions noxfile.py
Expand Up @@ -30,8 +30,8 @@
DEFAULT_PYTHON_VERSION = "3.8"

# We're using two Python versions to test with sqlalchemy 1.3 and 1.4.
SYSTEM_TEST_PYTHON_VERSIONS = ["3.8", "3.9"]
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()

Expand Down Expand Up @@ -100,7 +100,7 @@ def default(session):

if session.python == "3.8":
extras = "[tests,alembic]"
elif session.python == "3.9":
elif session.python == "3.10":
extras = "[tests,geography]"
else:
extras = "[tests]"
Expand Down Expand Up @@ -158,7 +158,7 @@ def system(session):
session.install("mock", "pytest", "google-cloud-testutils", "-c", constraints_path)
if session.python == "3.8":
extras = "[tests,alembic]"
elif session.python == "3.9":
elif session.python == "3.10":
extras = "[tests,geography]"
else:
extras = "[tests]"
Expand Down
8 changes: 4 additions & 4 deletions owlbot.py
Expand Up @@ -30,11 +30,11 @@
extras = ["tests"]
extras_by_python = {
"3.8": ["tests", "alembic"],
"3.9": ["tests", "geography"],
"3.10": ["tests", "geography"],
}
templated_files = common.py_library(
unit_test_python_versions=["3.6", "3.7", "3.8", "3.9"],
system_test_python_versions=["3.8", "3.9"],
unit_test_python_versions=["3.6", "3.7", "3.8", "3.9", "3.10"],
system_test_python_versions=["3.8", "3.10"],
cov_level=100,
unit_test_extras=extras,
unit_test_extras_by_python=extras_by_python,
Expand Down Expand Up @@ -136,7 +136,7 @@ def compliance(session):
)
if session.python == "3.8":
extras = "[tests,alembic]"
elif session.python == "3.9":
elif session.python == "3.10":
extras = "[tests,geography]"
else:
extras = "[tests]"
Expand Down
13 changes: 10 additions & 3 deletions samples/snippets/requirements-test.txt
@@ -1,12 +1,19 @@
attrs==21.2.0
google-cloud-testutils==1.2.0
importlib-metadata==4.8.1
cachetools==4.2.4
click==8.0.3
google-auth==2.3.3
google-cloud-testutils==1.3.1
importlib-metadata==4.8.3
iniconfig==1.1.1
packaging==21.0
pluggy==1.0.0
py==1.10.0
pyasn1==0.4.8
pyasn1-modules==0.2.8
pyparsing==3.0.2
pytest==6.2.5
rsa==4.8
six==1.16.0
toml==0.10.2
typing-extensions==3.10.0.2
typing-extensions==4.0.1
zipp==3.6.0
55 changes: 13 additions & 42 deletions samples/snippets/requirements.txt
@@ -1,66 +1,37 @@
aiocontextvars==0.2.2
attrs==21.2.0
alembic==1.7.5
cachetools==4.2.4
certifi==2021.10.8
cffi==1.15.0
charset-normalizer==2.0.7
click==8.0.3
click-plugins==1.1.1
cligj==0.7.2
contextvars==2.4
dataclasses==0.6; python_version < '3.7'
Deprecated==1.2.13
Fiona==1.8.20
future==0.18.2
GeoAlchemy2==0.9.4
geopandas==0.9.0; python_version < '3.7'
geopandas==0.10.0; python_version >= '3.7'
google-api-core==2.2.0
geoalchemy2==0.9.4
google-api-core[grpc]==2.2.0
google-auth==2.3.2
google-cloud-bigquery==2.28.1
google-cloud-bigquery-storage==2.9.1
google-cloud-bigquery==2.31.0
google-cloud-core==2.1.0
google-crc32c==1.3.0
google-resumable-media==2.1.0
googleapis-common-protos==1.53.0
greenlet==1.1.2
grpcio==1.41.1
grpcio==1.43.0
grpcio-status==1.43.0
idna==3.3
immutables==0.16
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.7'
opentelemetry-api==1.6.2
opentelemetry-instrumentation==0.25b2
opentelemetry-sdk==1.6.2
opentelemetry-semantic-conventions==0.25b2
importlib-metadata==4.8.3
importlib-resources==5.4.0
mako==1.1.6
markupsafe==2.0.1
packaging==21.0
pandas==1.1.5; python_version < '3.7'
pandas==1.3.2; python_version >= '3.7'
proto-plus==1.19.7
protobuf==3.19.0
pyarrow==6.0.0
pyasn1==0.4.8
pyasn1-modules==0.2.8
pycparser==2.20
pyparsing==3.0.2
pyproj==3.0.1; python_version < '3.7'
pyproj==3.1.0; python_version >= '3.7'
python-dateutil==2.8.2
pytz==2021.3
PyYAML==6.0
requests==2.26.0
rsa==4.7.2
Shapely==1.8.0
shapely==1.8.0
six==1.16.0
SQLAlchemy==1.4.26
sqlalchemy-bigquery==1.2.1
tqdm==4.62.3
typing-extensions==3.10.0.2
typing-inspect==0.7.1
sqlalchemy==1.4.26
typing-extensions==4.0.1
urllib3==1.26.7
wrapt==1.13.2
zipp==3.6.0
3 changes: 2 additions & 1 deletion setup.py
Expand Up @@ -73,6 +73,7 @@ def readme():
"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 :: Database :: Front-Ends",
],
Expand All @@ -93,7 +94,7 @@ def readme():
"future",
],
extras_require=extras,
python_requires=">=3.6, <3.10",
python_requires=">=3.6, <3.11",
tests_require=["packaging", "pytz"],
entry_points={
"sqlalchemy.dialects": ["bigquery = sqlalchemy_bigquery:BigQueryDialect"]
Expand Down

0 comments on commit 4b3505b

Please sign in to comment.