From 84db21c724143e21673e266d98857c4235d1499a Mon Sep 17 00:00:00 2001 From: Lioman Date: Fri, 20 Sep 2024 14:46:29 +0200 Subject: [PATCH] Match actual version instead of regex in `build` CI job (#3396) --- pelican/tests/build_test/test_build_files.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pelican/tests/build_test/test_build_files.py b/pelican/tests/build_test/test_build_files.py index 8e295f32..c59d9235 100644 --- a/pelican/tests/build_test/test_build_files.py +++ b/pelican/tests/build_test/test_build_files.py @@ -1,3 +1,4 @@ +import importlib.metadata import tarfile from pathlib import Path from re import match @@ -5,6 +6,8 @@ from zipfile import ZipFile import pytest +version = importlib.metadata.version("pelican") + @pytest.mark.skipif( "not config.getoption('--check-build')", @@ -16,7 +19,7 @@ def test_wheel_contents(pytestconfig): that everything that is needed is included in the final build """ dist_folder = pytestconfig.getoption("--check-build") - wheels = Path(dist_folder).rglob("*.whl") + wheels = Path(dist_folder).rglob(f"pelican-{version}-py3-none-any.whl") for wheel_file in wheels: files_list = ZipFile(wheel_file).namelist() # Check if theme files are copied to wheel @@ -52,7 +55,7 @@ def test_sdist_contents(pytestconfig, expected_file): that everything that is needed is included in the final build. """ dist_folder = pytestconfig.getoption("--check-build") - sdist_files = Path(dist_folder).rglob("*.tar.gz") + sdist_files = Path(dist_folder).rglob(f"pelican-{version}.tar.gz") for dist in sdist_files: files_list = tarfile.open(dist, "r:gz").getnames() dir_matcher = "" @@ -61,6 +64,6 @@ def test_sdist_contents(pytestconfig, expected_file): filtered_values = [ path for path in files_list - if match(rf"^pelican-\d+\.\d+\.\d+/{expected_file}{dir_matcher}$", path) + if match(rf"^pelican-{version}/{expected_file}{dir_matcher}$", path) ] assert len(filtered_values) > 0