Skip to content

Commit 7b4b708

Browse files
SNOW-926289 restrict urllib3 pin to only affect Python < 3.10 (#1799)
1 parent 35c2f6f commit 7b4b708

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

DESCRIPTION.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Source code is also available at: https://github.com/snowflakedb/snowflake-conne
1212
- v3.6.0(TBD)
1313

1414
- Added support for Vector types
15+
- Changed urllib3 version pin to only affect Python versions < 3.10.
1516

1617
- v3.5.0(November 13,2023)
1718

@@ -23,7 +24,7 @@ Source code is also available at: https://github.com/snowflakedb/snowflake-conne
2324
- Deprecated environment variable `NANOARROW_USAGE`.
2425
- Deprecated module variable `snowflake.connector.cursor.NANOARROW_USAGE`.
2526

26-
- v3.4.1(November 08, 2023)
27+
- v3.4.1(November 08,2023)
2728

2829
- Bumped vendored `urllib3` to 1.26.18
2930
- Bumped vendored `requests` to 2.31.0

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ install_requires =
5353
packaging
5454
charset_normalizer>=2,<4
5555
idna>=2.5,<4
56-
urllib3>=1.21.1,<2.0.0
56+
urllib3>=1.21.1,<2.0.0; python_version < '3.10'
5757
certifi>=2017.4.17
5858
typing_extensions>=4.3,<5
5959
filelock>=3.5,<4

test/unit/test_cache.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -349,13 +349,11 @@ def test_filelock_hang(self, tmpdir, caplog):
349349
# changes, we set force_flush to True
350350
with c._lock:
351351
assert not c._save(force_flush=True)
352-
assert caplog.record_tuples == [
353-
(
354-
"snowflake.connector.cache",
355-
logging.DEBUG,
356-
f"acquiring {c._file_lock_path} timed out, skipping saving...",
357-
),
358-
]
352+
assert (
353+
"snowflake.connector.cache",
354+
logging.DEBUG,
355+
f"acquiring {c._file_lock_path} timed out, skipping saving...",
356+
) in caplog.record_tuples
359357

360358
def test_pickle(self, tmpdir):
361359
c = AlwaysSaveSFDictFileCache(file_path=os.path.join(tmpdir, "cache.txt"))

0 commit comments

Comments
 (0)