From ca4aed3535a2ca516a62f864a68c13c63f92e00b Mon Sep 17 00:00:00 2001 From: Shane Harvey Date: Thu, 14 Nov 2024 16:20:05 -0800 Subject: [PATCH 1/4] PYTHON-4977 Fix import time on Windows again --- pymongo/pool_options.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pymongo/pool_options.py b/pymongo/pool_options.py index f3ed6cd2c1..038dbb3b5d 100644 --- a/pymongo/pool_options.py +++ b/pymongo/pool_options.py @@ -70,13 +70,14 @@ "version": platform.mac_ver()[0], } elif sys.platform == "win32": + _ver = sys.getwindowsversion() _METADATA["os"] = { - "type": platform.system(), - # "Windows XP", "Windows 7", "Windows 10", etc. - "name": " ".join((platform.system(), platform.release())), - "architecture": platform.machine(), - # Windows patch level (e.g. 5.1.2600-SP3) - "version": "-".join(platform.win32_ver()[1:3]), + "type": "Windows", + "name": "Windows", + # Avoid using platform calls, see PYTHON-4455. + "architecture": os.environ.get("PROCESSOR_ARCHITECTURE") or platform.machine(), + # Windows patch level (e.g. 10.0.17763-SP0). + "version": ".".join(map(str, _ver[:3])) + f"-SP{_ver[-1] or '0'}", } elif sys.platform.startswith("java"): _name, _ver, _arch = platform.java_ver()[-1] From 0a273a345ab683006cf1a0cf9744259658a00f50 Mon Sep 17 00:00:00 2001 From: Shane Harvey Date: Thu, 14 Nov 2024 16:30:01 -0800 Subject: [PATCH 2/4] PYTHON-4977 Add import time check on Windows --- .evergreen/config.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index fc1713a88e..bcb967605d 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1798,11 +1798,17 @@ buildvariants: - name: test_aws_lambda_task_group - name: rhel8-import-time - display_name: Import Time + display_name: Import Time Linux run_on: rhel87-small tasks: - name: "check-import-time" +- name: windows-import-time + display_name: Import Time Windows + run_on: windows-64-vsMulti-small + tasks: + - name: "check-import-time" + - name: backport-pr display_name: "Backport PR" run_on: From 8db60dd13f57e40a64e0836d8cf77548331f6bb7 Mon Sep 17 00:00:00 2001 From: Shane Harvey Date: Thu, 14 Nov 2024 16:48:17 -0800 Subject: [PATCH 3/4] PYTHON-4977 Fix git on windows --- .evergreen/run-import-time-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/run-import-time-test.sh b/.evergreen/run-import-time-test.sh index 2b17f5ffeb..77a027c827 100755 --- a/.evergreen/run-import-time-test.sh +++ b/.evergreen/run-import-time-test.sh @@ -25,7 +25,7 @@ function get_import_time() { } get_import_time $HEAD_SHA -git stash +git -c user.name=evergreen -c user.email=evergreen@test.com stash git checkout $BASE_SHA get_import_time $BASE_SHA git checkout $HEAD_SHA From 48a8a4ed91b4f50d8487cfb5d0cfd200b8a334f7 Mon Sep 17 00:00:00 2001 From: Shane Harvey Date: Thu, 14 Nov 2024 16:57:20 -0800 Subject: [PATCH 4/4] PYTHON-4977 Remove useless windows import check --- .evergreen/config.yml | 8 +------- .evergreen/run-import-time-test.sh | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index bcb967605d..fc1713a88e 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1798,17 +1798,11 @@ buildvariants: - name: test_aws_lambda_task_group - name: rhel8-import-time - display_name: Import Time Linux + display_name: Import Time run_on: rhel87-small tasks: - name: "check-import-time" -- name: windows-import-time - display_name: Import Time Windows - run_on: windows-64-vsMulti-small - tasks: - - name: "check-import-time" - - name: backport-pr display_name: "Backport PR" run_on: diff --git a/.evergreen/run-import-time-test.sh b/.evergreen/run-import-time-test.sh index 77a027c827..2b17f5ffeb 100755 --- a/.evergreen/run-import-time-test.sh +++ b/.evergreen/run-import-time-test.sh @@ -25,7 +25,7 @@ function get_import_time() { } get_import_time $HEAD_SHA -git -c user.name=evergreen -c user.email=evergreen@test.com stash +git stash git checkout $BASE_SHA get_import_time $BASE_SHA git checkout $HEAD_SHA