mirrors/solus-packages
1
1
Fork 0
mirror of https://github.com/getsolus/packages.git synced 2025-04-25 20:30:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

yauto: Fix adding pyproject.toml deps and only do it once

Browse source 
**Summary**

The previous change to pyproject.toml happened to only work for sources also using other, higher-priority build systems. The logic for adding the dependencies to PYTHON_MODULE recipes was still based on strings.

Additionaly the dependencies were added multiple times for each `pyproject.toml` or `setup.cfg file` found. Don't add additional dependencies if PEP 517 is already among known_types

Make sure the PEP517 dependencies are correctly added if the source also uses other build systems instead of wrapping them in pkgconfig()

Signed-off-by: Thomas Staudinger <Staudi.Kaos@gmail.com>
This commit is contained in:
Thomas Staudinger 2025-02-10 03:04:52 +01:00
parent b34276b53a
commit 9383e41382
No known key found for this signature in database
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
common/Scripts/yauto.py
View file

@ -42,6 +42,7 @@ MESON = 9
YARN = 10
WAF = 11
QMAKE = 12
PEP517 = 13
class DepObject:
@ -164,9 +165,11 @@ class AutoPackage:
)
# Handle python modules respecting PEP517.
if "pyproject.toml" in file or "setup.cfg" in file:
self.build_deps.extend(self.extra_build_deps(["python-build", "python-installer",
"python-packaging", "python-wheel"]))
if PEP517 not in known_types:
known_types.append(PEP517)
pyproject_deps = ["python-build", "python-installer",
"python-packaging", "python-wheel"]
self.build_deps.extend(self.extra_build_deps(pyproject_deps))
if "Makefile.PL" in file or "Build.PL" in file:
# This is a perl module
known_types.append(PERL_MODULES)
@ -234,6 +237,9 @@ class AutoPackage:
self.compile_type = YARN
self.networking = True
print("yarn")
elif PEP517 in known_types:
self.compile_type = PYTHON_MODULES
print("PEP517")
else:
print("unknown")
@ -320,8 +326,11 @@ description: |
total_str += "\nbuilddeps :\n"
if self.build_deps is not None and len(self.build_deps) > 0:
if self.compile_type == PYTHON_MODULES:
total_str += self.build_deps
if self.compile_type == PYTHON_MODULES or self.component == "programming.python":
for dep in self.build_deps:
if len(dep.name.strip()) == 0:
continue
total_str += " - %s\n" % dep.name
else:
for dep in self.build_deps:
if len(dep.name.strip()) == 0: