Account with package names ending with digits

Author: befeleme

pyp2spec/conf2spec.py

@@ -15,7 +15,7 @@
 from jinja2 import Template
 
 from pyp2spec.rpmversion import RpmVersion
-from pyp2spec.utils import Pyp2specError
+from pyp2spec.utils import Pyp2specError, create_compat_python_name
 from pyp2spec.utils import warn, yay
 
 
@@ -188,7 +188,7 @@ def fill_in_template(config: ConfigFile) -> str:
         license_notice=license_notice,
         mandate_license=config.get_bool("license_files_present"),
         name=config.get_string("pypi_name"),
-        python_name=config.get_string("python_name"),
+        python_compat_name=create_compat_python_name(config.get_string("python_name"), config.get_string("compat")),
         pypi_version=pypi_version_or_macro(pypi_version),
         python_alt_version=config.get_string("python_alt_version"),
         source=source(config, pypi_version),
@@ -208,9 +208,7 @@ def save_spec_file(config: ConfigFile, output: str | None) -> str:
 
     result = fill_in_template(config)
     if output is None:
-        output = config.get_string("python_name")
-        if compat := config.get_string("compat"):
-            output += compat
+        output = create_compat_python_name(config.get_string("python_name"), config.get_string("compat"))
         output += ".spec"
     with open(output, "w", encoding="utf-8") as spec_file:
         spec_file.write(result)

pyp2spec/pyp2conf.py

@@ -11,7 +11,7 @@
 from pyp2spec.license_processor import check_compliance, resolve_license_expression
 from pyp2spec.utils import Pyp2specError, normalize_name, get_extras, get_summary_or_placeholder
 from pyp2spec.utils import prepend_name_with_python, archive_name
-from pyp2spec.utils import is_archful, resolve_url
+from pyp2spec.utils import is_archful, resolve_url, create_compat_python_name
 from pyp2spec.utils import warn, caution, inform, yay
 from pyp2spec.pypi_loaders import load_from_pypi, load_core_metadata_from_pypi, CoreMetadataNotFoundError
 
@@ -159,10 +159,8 @@ def save_config(contents: dict, output: str | None = None) -> str:
     Return the saved file name.
     """
     if not output:
-        package = contents["python_name"]
-        if compat := contents.get("compat"):
-            package += compat
-        output = f"{package}.conf"
+        package_name = create_compat_python_name(contents.get("python_name"), contents.get("compat"))
+        output = f"{package_name}.conf"
     with open(output, "wb") as f:
         tomli_w.dump(contents, f, multiline_strings=True)
     yay(f"Configuration file was saved successfully to '{output}'")

pyp2spec/template.spec

@@ -2,7 +2,7 @@
 %global python3_pkgversion {{ python_alt_version }}
 
 {% endif -%}
-Name:           {{python_name}}{{compat}}
+Name:           {{python_compat_name}}
 Version:        {{version}}
 Release:        %autorelease
 # Fill in the actual package summary to submit package to Fedora

pyp2spec/utils.py

@@ -190,3 +190,11 @@ def resolve_url(urls: dict) -> str:
         if values_list := list(normalized_urls.values()):
             return values_list[0]
         return "..."
+
+
+def create_compat_python_name(python_name: str, compat: str | None) -> str:
+    if not compat:
+        return python_name
+    if python_name[-1].isdigit():
+        return f"{python_name}_{compat}"
+    return f"{python_name}{compat}"

tests/test_utils.py

@@ -4,6 +4,7 @@
 from pyp2spec.utils import normalize_name, get_extras, is_archful
 from pyp2spec.utils import normalize_as_wheel_name, archive_name
 from pyp2spec.utils import resolve_url, SdistNotFoundError, MissingPackageNameError
+from pyp2spec.utils import create_compat_python_name
 
 
 def test_license_classifier_read_correctly():
@@ -178,3 +179,15 @@ def test_project_urls_valid_multiple():
 
 def test_project_urls_empty():
     assert resolve_url({}) == "..."
+
+
+@pytest.mark.parametrize(
+    ("name", "compat", "expected"), [
+        ("my-package-foo", None, "my-package-foo"),
+        ("my-package-foo", "3.5", "my-package-foo3.5"),
+        ("my-package-foo2", None, "my-package-foo2"),
+        ("my-package-foo2", "3.5", "my-package-foo2_3.5"),
+    ]
+)
+def test_create_compat_python_name(name, compat, expected):
+    assert create_compat_python_name(name, compat) == expected