chore: support versions with one alphanumeric part and a prefix in the commit finder (#709)

Signed-off-by: Ben Selwyn-Smith <benselwynsmith@googlemail.com>

Author: benmss

src/macaron/repo_finder/commit_finder.py

@@ -341,8 +341,14 @@ def _build_version_pattern(name: str, version: str) -> tuple[Pattern | None, lis
             # - 3.1.test.2 -> 'test' and '2' become optional.
             has_non_numeric_suffix = True
 
-        if count == len(split) - 1 and has_trailing_zero or has_non_numeric_suffix:
-            # This part will be made optional in the regex, hence the grouping bracket.
+        # This part will be made optional in the regex if it matches the correct requirements:
+        # - There is more than one version part, e.g. 1.2 (2), 1.2.3 (3)
+        # - AND either of:
+        #   - This is the last version part and it has a trailing zero, e.g. 10
+        #   - OR has_non_numeric_suffix is True (See its comments above for more details)
+        optional = len(split) > 1 and ((count == len(split) - 1 and has_trailing_zero) or has_non_numeric_suffix)
+
+        if optional:
             this_version_pattern = this_version_pattern + "("
 
         if count == 1:
@@ -353,7 +359,7 @@ def _build_version_pattern(name: str, version: str) -> tuple[Pattern | None, lis
         # Add the current part to the pattern.
         this_version_pattern = this_version_pattern + part
 
-        if count == len(split) - 1 and has_trailing_zero or has_non_numeric_suffix:
+        if optional:
             # Complete the optional capture group.
             this_version_pattern = this_version_pattern + ")?"
 

tests/e2e/repo_finder/resources/tags.json

@@ -303625,5 +303625,106 @@
                 "comment": ""
             }
         ]
+    },
+    {
+        "tags": [
+            "2009n_release",
+            "2009p_release",
+            "2009r_release",
+            "2009u_release",
+            "2010b_release",
+            "2010e_release",
+            "2010g_release",
+            "2010h_release",
+            "2010k_release",
+            "2010l_release",
+            "2010o_release",
+            "2011b_release",
+            "2011c_release",
+            "2011d_release",
+            "2011e_release",
+            "2011g_release",
+            "2011j_release",
+            "release_2011k",
+            "release_2011n",
+            "release_2012b",
+            "release_2012c",
+            "release_2012d",
+            "release_2012f",
+            "release_2012g",
+            "release_2012h",
+            "release_2012j",
+            "release_2013.6",
+            "release_2013.7",
+            "release_2013.8",
+            "release_2013.9",
+            "release_2013b",
+            "release_2013d",
+            "release_2014.1",
+            "release_2014.1.1",
+            "release_2014.10",
+            "release_2014.2",
+            "release_2014.3",
+            "release_2014.4",
+            "release_2014.7",
+            "release_2014.9",
+            "release_2015.2",
+            "release_2015.6",
+            "release_2016.1",
+            "release_2016.10",
+            "release_2016.4",
+            "release_2016.6",
+            "release_2016.6.1",
+            "release_2016.7",
+            "release_2017.2",
+            "release_2017.3",
+            "release_2018.3",
+            "release_2018.4",
+            "release_2018.5",
+            "release_2018.6",
+            "release_2018.7",
+            "release_2018.9",
+            "release_2019.1",
+            "release_2019.2",
+            "release_2019.3",
+            "release_2020.1",
+            "release_2020.4",
+            "release_2020.5",
+            "release_2021.1",
+            "release_2021.3",
+            "release_2022.1",
+            "release_2022.2",
+            "release_2022.2.1",
+            "release_2022.4",
+            "release_2022.5",
+            "release_2022.6",
+            "release_2022.7",
+            "release_2022.7.1",
+            "release_2023.2",
+            "release_2023.3",
+            "release_2023.3.post1",
+            "release_2023.4",
+            "release_2024.1"
+        ],
+        "artifacts": [
+            {
+                "purl": "pkg:pypi/pytz@2011n",
+                "repo": "https://github.com/stub42/pytz",
+                "match": "release_2011n",
+                "comment": ""
+            },
+            {
+                "purl": "pkg:pypi/pytz@2010o",
+                "repo": "https://github.com/stub42/pytz",
+                "match": "2010o_release",
+                "comment": ""
+            },
+            {
+                "purl": "pkg:pypi/pytz@2023.3.post1",
+                "repo": "https://github.com/stub42/pytz",
+                "match": "release_2023.3.post1",
+                "comment": ""
+            }
+        ]
     }
 ]