Skip to content

Commit 9ca34b8

Browse files
authored
Merge branch 'main' into remove-python-37-38
2 parents 78574c0 + 158243b commit 9ca34b8

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

noxfile.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def default(session, tests_path):
185185
session.run(
186186
"py.test",
187187
"--quiet",
188-
"-W default::PendingDeprecationWarning",
188+
"-W default::FutureWarning",
189189
f"--junitxml={os.path.split(tests_path)[-1]}_{session.python}_sponge_log.xml",
190190
"--cov=db_dtypes",
191191
"--cov=tests/unit",
@@ -263,7 +263,7 @@ def prerelease(session, tests_path):
263263
session.run(
264264
"py.test",
265265
"--quiet",
266-
"-W default::PendingDeprecationWarning",
266+
"-W default::FutureWarning",
267267
f"--junitxml={os.path.split(tests_path)[-1]}_prerelease_{session.python}_sponge_log.xml",
268268
"--cov=db_dtypes",
269269
"--cov=tests/unit",

tests/unit/test__init__.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
@pytest.mark.parametrize(
2727
"mock_version_tuple, version_str",
2828
[
29-
((3, 7, 10), "3.7.10"),
29+
((3, 7, https://github.com/googleapis/python-db-dtypes-pandas/pull/337/conflict?name=tests%252Funit%252Ftest__init__.py&base_oid=7ae260c04195ba4ee9c64907bcfe6f51a960a75f&head_oid=4b86d5458315130ea3d75ea45fc5526b34a4f9f710), "3.7.10"),
3030
((3, 7, 0), "3.7.0"),
3131
((3, 8, 5), "3.8.5"),
3232
((3, 8, 12), "3.8.12"),
@@ -66,8 +66,6 @@ def test_check_python_version_warns_on_unsupported(mock_version_tuple, version_s
6666
(3, 10, 0),
6767
(3, 11, 2),
6868
(3, 12, 0),
69-
(4, 0, 0), # Future version
70-
(3, 6, 0), # Older unsupported, but not 3.7/3.8
7169
],
7270
)
7371
def test_check_python_version_does_not_warn_on_supported(mock_version_tuple):
@@ -144,3 +142,4 @@ def test_determine_all_excludes_json_when_unavailable(mock_array, mock_dtype):
144142
assert "JSONDtype" not in result
145143
assert "JSONArray" not in result
146144
assert "JSONArrowType" not in result
145+

0 commit comments

Comments
 (0)