Skip to content

Commit 4b3505b

Browse files
aucampiatswast
andauthored
feat: Enable support for 3.10 (#381)
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 <[email protected]>
1 parent b5a55ab commit 4b3505b

File tree

5 files changed

+33
-54
lines changed

5 files changed

+33
-54
lines changed

noxfile.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
DEFAULT_PYTHON_VERSION = "3.8"
3131

3232
# We're using two Python versions to test with sqlalchemy 1.3 and 1.4.
33-
SYSTEM_TEST_PYTHON_VERSIONS = ["3.8", "3.9"]
34-
UNIT_TEST_PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9"]
33+
SYSTEM_TEST_PYTHON_VERSIONS = ["3.8", "3.10"]
34+
UNIT_TEST_PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9", "3.10"]
3535

3636
CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()
3737

@@ -100,7 +100,7 @@ def default(session):
100100

101101
if session.python == "3.8":
102102
extras = "[tests,alembic]"
103-
elif session.python == "3.9":
103+
elif session.python == "3.10":
104104
extras = "[tests,geography]"
105105
else:
106106
extras = "[tests]"
@@ -158,7 +158,7 @@ def system(session):
158158
session.install("mock", "pytest", "google-cloud-testutils", "-c", constraints_path)
159159
if session.python == "3.8":
160160
extras = "[tests,alembic]"
161-
elif session.python == "3.9":
161+
elif session.python == "3.10":
162162
extras = "[tests,geography]"
163163
else:
164164
extras = "[tests]"

owlbot.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
extras = ["tests"]
3131
extras_by_python = {
3232
"3.8": ["tests", "alembic"],
33-
"3.9": ["tests", "geography"],
33+
"3.10": ["tests", "geography"],
3434
}
3535
templated_files = common.py_library(
36-
unit_test_python_versions=["3.6", "3.7", "3.8", "3.9"],
37-
system_test_python_versions=["3.8", "3.9"],
36+
unit_test_python_versions=["3.6", "3.7", "3.8", "3.9", "3.10"],
37+
system_test_python_versions=["3.8", "3.10"],
3838
cov_level=100,
3939
unit_test_extras=extras,
4040
unit_test_extras_by_python=extras_by_python,
@@ -136,7 +136,7 @@ def compliance(session):
136136
)
137137
if session.python == "3.8":
138138
extras = "[tests,alembic]"
139-
elif session.python == "3.9":
139+
elif session.python == "3.10":
140140
extras = "[tests,geography]"
141141
else:
142142
extras = "[tests]"
+10-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
attrs==21.2.0
2-
google-cloud-testutils==1.2.0
3-
importlib-metadata==4.8.1
2+
cachetools==4.2.4
3+
click==8.0.3
4+
google-auth==2.3.3
5+
google-cloud-testutils==1.3.1
6+
importlib-metadata==4.8.3
47
iniconfig==1.1.1
58
packaging==21.0
69
pluggy==1.0.0
710
py==1.10.0
11+
pyasn1==0.4.8
12+
pyasn1-modules==0.2.8
813
pyparsing==3.0.2
914
pytest==6.2.5
15+
rsa==4.8
16+
six==1.16.0
1017
toml==0.10.2
11-
typing-extensions==3.10.0.2
18+
typing-extensions==4.0.1
1219
zipp==3.6.0

samples/snippets/requirements.txt

+13-42
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,37 @@
1-
aiocontextvars==0.2.2
2-
attrs==21.2.0
1+
alembic==1.7.5
32
cachetools==4.2.4
43
certifi==2021.10.8
5-
cffi==1.15.0
64
charset-normalizer==2.0.7
7-
click==8.0.3
8-
click-plugins==1.1.1
9-
cligj==0.7.2
10-
contextvars==2.4
11-
dataclasses==0.6; python_version < '3.7'
12-
Deprecated==1.2.13
13-
Fiona==1.8.20
145
future==0.18.2
15-
GeoAlchemy2==0.9.4
16-
geopandas==0.9.0; python_version < '3.7'
17-
geopandas==0.10.0; python_version >= '3.7'
18-
google-api-core==2.2.0
6+
geoalchemy2==0.9.4
7+
google-api-core[grpc]==2.2.0
198
google-auth==2.3.2
20-
google-cloud-bigquery==2.28.1
21-
google-cloud-bigquery-storage==2.9.1
9+
google-cloud-bigquery==2.31.0
2210
google-cloud-core==2.1.0
2311
google-crc32c==1.3.0
2412
google-resumable-media==2.1.0
2513
googleapis-common-protos==1.53.0
2614
greenlet==1.1.2
27-
grpcio==1.41.1
15+
grpcio==1.43.0
16+
grpcio-status==1.43.0
2817
idna==3.3
29-
immutables==0.16
30-
importlib-metadata==4.8.1
31-
libcst==0.3.21
32-
munch==2.5.0
33-
mypy-extensions==0.4.3
34-
numpy==1.19.5; python_version < '3.7'
35-
numpy==1.21.2; python_version >= '3.7'
36-
opentelemetry-api==1.6.2
37-
opentelemetry-instrumentation==0.25b2
38-
opentelemetry-sdk==1.6.2
39-
opentelemetry-semantic-conventions==0.25b2
18+
importlib-metadata==4.8.3
19+
importlib-resources==5.4.0
20+
mako==1.1.6
21+
markupsafe==2.0.1
4022
packaging==21.0
41-
pandas==1.1.5; python_version < '3.7'
42-
pandas==1.3.2; python_version >= '3.7'
4323
proto-plus==1.19.7
4424
protobuf==3.19.0
45-
pyarrow==6.0.0
4625
pyasn1==0.4.8
4726
pyasn1-modules==0.2.8
48-
pycparser==2.20
4927
pyparsing==3.0.2
50-
pyproj==3.0.1; python_version < '3.7'
51-
pyproj==3.1.0; python_version >= '3.7'
5228
python-dateutil==2.8.2
5329
pytz==2021.3
54-
PyYAML==6.0
5530
requests==2.26.0
5631
rsa==4.7.2
57-
Shapely==1.8.0
32+
shapely==1.8.0
5833
six==1.16.0
59-
SQLAlchemy==1.4.26
60-
sqlalchemy-bigquery==1.2.1
61-
tqdm==4.62.3
62-
typing-extensions==3.10.0.2
63-
typing-inspect==0.7.1
34+
sqlalchemy==1.4.26
35+
typing-extensions==4.0.1
6436
urllib3==1.26.7
65-
wrapt==1.13.2
6637
zipp==3.6.0

setup.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ def readme():
7373
"Programming Language :: Python :: 3.7",
7474
"Programming Language :: Python :: 3.8",
7575
"Programming Language :: Python :: 3.9",
76+
"Programming Language :: Python :: 3.10",
7677
"Operating System :: OS Independent",
7778
"Topic :: Database :: Front-Ends",
7879
],
@@ -93,7 +94,7 @@ def readme():
9394
"future",
9495
],
9596
extras_require=extras,
96-
python_requires=">=3.6, <3.10",
97+
python_requires=">=3.6, <3.11",
9798
tests_require=["packaging", "pytz"],
9899
entry_points={
99100
"sqlalchemy.dialects": ["bigquery = sqlalchemy_bigquery:BigQueryDialect"]

0 commit comments

Comments
 (0)