1580158
/
kohya_ss
mirror of https://github.com/bmaltais/kohya_ss
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge c57fda4499 into 4161d1d80a

pull/3484/merge
S. Piri 2026-02-12 15:59:27 +11:00 committed by GitHub
parent 4161d1d80a c57fda4499
commit 5e79894307
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
setup/setup_common.py
View File

@ -5,7 +5,7 @@ import shutil
import datetime
import subprocess
import re
import pkg_resources
import importlib.metadata
log = logging.getLogger("sd")
@ -602,19 +602,28 @@ def installed(package, friendly: str = None):
pkg_name, pkg_version = pkg.strip(), None
# Attempt to find the installed package by its name
spec = pkg_resources.working_set.by_key.get(pkg_name, None)
try:
spec = importlib.metadata.distribution(pkg_name)
except importlib.metadata.PackageNotFoundError:
spec = None
if spec is None:
# Try again with lowercase name
spec = pkg_resources.working_set.by_key.get(pkg_name.lower(), None)
try:
spec = importlib.metadata.distribution(pkg_name.lower())
except importlib.metadata.PackageNotFoundError:
spec = None
if spec is None:
# Try replacing underscores with dashes
spec = pkg_resources.working_set.by_key.get(
pkg_name.replace("_", "-"), None
)
try:
spec = importlib.metadata.distribution(pkg_name.replace("_", "-"))
except importlib.metadata.PackageNotFoundError:
spec = None
if spec is not None:
# Package is found, check version
version = pkg_resources.get_distribution(pkg_name).version
version = spec.version
log.debug(f"Package version found: {pkg_name} {version}")
if pkg_version is not None: