From af55f494a3ad8aefa78d0370f2dd721c6e993241 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 3 Nov 2023 11:25:07 -0400 Subject: [PATCH] tests: fix regex to include build numbers Signed-off-by: Henry Schreiner --- scripts/list_test_packages.py | 2 +- testdata/tests_packages/macos21-python3.7.txt | 2 +- testdata/tests_packages/macos21-python3.8.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/list_test_packages.py b/scripts/list_test_packages.py index 0f701b3023..4c4123b621 100644 --- a/scripts/list_test_packages.py +++ b/scripts/list_test_packages.py @@ -130,7 +130,7 @@ def create_test_packages_list( all_packages = [] for downloaded_filename in downloaded_list: wheel_re = re.search( - r"(.+)\-([^-]+)\-([^-]+)\-([^-]+)\-([^-]+)\.whl$", downloaded_filename + r"([^-]+)\-([^-]+)\-([^-]+)\-([^-]+)\-([^-]+)(-[^-]+)?\.whl$", downloaded_filename ) src_re = re.search(r"(.+)\-([^-]+)\.(?:tar.gz|zip)$", downloaded_filename) if wheel_re: diff --git a/testdata/tests_packages/macos21-python3.7.txt b/testdata/tests_packages/macos21-python3.7.txt index 4bc92d6847..7a61081e16 100644 --- a/testdata/tests_packages/macos21-python3.7.txt +++ b/testdata/tests_packages/macos21-python3.7.txt @@ -20,7 +20,7 @@ attrs==22.1.0 awscli==1.18.168 backcall==0.2.0 beautifulsoup4==4.11.1 -black-22.10.0==1fixedarch +black==22.10.0 black==22.8.0 bleach==5.0.1 boto3==1.26.20 diff --git a/testdata/tests_packages/macos21-python3.8.txt b/testdata/tests_packages/macos21-python3.8.txt index 0ffdc9f5c2..3094f29d49 100644 --- a/testdata/tests_packages/macos21-python3.8.txt +++ b/testdata/tests_packages/macos21-python3.8.txt @@ -21,7 +21,7 @@ attrs==22.1.0 awscli==1.18.168 backcall==0.2.0 beautifulsoup4==4.11.1 -black-22.10.0==1fixedarch +black==22.10.0 black==22.8.0 bleach==5.0.1 boto3==1.26.20