From 79ed3720797d940b1d2ea2443cefbdfec75ac04a Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Tue, 9 Jan 2024 02:15:47 +0100 Subject: [PATCH] Support ~= expressions in dependencies. --- .github/workflows/UnitTesting.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/UnitTesting.yml b/.github/workflows/UnitTesting.yml index a1e855c..a61ae0b 100644 --- a/.github/workflows/UnitTesting.yml +++ b/.github/workflows/UnitTesting.yml @@ -151,7 +151,7 @@ jobs: packages = { "coverage": "python-coverage:p", "igraph": "igraph:p", - "Jinja2": "python-markupsafe:p", + "jinja2": "python-markupsafe:p", "lxml": "python-lxml:p", "numpy": "python-numpy:p", "markupsafe": "python-markupsafe:p", @@ -162,19 +162,19 @@ jobs: "wheel": "python-wheel:p", } subPackages = { - "pyTooling": { + "pytooling": { "yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p", } } - regExp = compile(r"(?P[\w_\-\.]+)(?:\[(?P(?:\w+)(?:,\w+)*)\])?(?:\s*(?P[<>=]+)\s*)(?P\d+(?:\.\d+)*)(?:-(?P\w+))?") + regExp = compile(r"(?P[\w_\-\.]+)(?:\[(?P(?:\w+)(?:\s*,\s*\w+)*)\])?(?:\s*(?P[<>~=]+)\s*)(?P\d+(?:\.\d+)*)(?:-(?P\w+))?") pacboyPackages = set(("python-pip:p", "python-wheel:p", "python-tomli:p")) print(f"Processing dependencies ({len(dependencies)}):") for dependency in dependencies: print(f" {dependency}") - match = regExp.match(dependency) + match = regExp.match(dependency.lower()) if not match: print(f" Wrong format: {dependency}") print(f"::error title=Identifying Pacboy Packages::Unrecognized dependency format '{dependency}'")