janware/jw-pkg
1
Code Pull requests Activity Actions

cmds.project.lib.pkg_relations(): Fix: Empty output

Browse source 
This reverts the changes commit 24928c6f did beyond mere type fixes to pkg_relations(). It looked better, but it had the output collapse to an empty list. Refactoring of that mega-function postponed.
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-06-01 15:41:45 +02:00
commit d0cb9817a2
Signed by: Jan Lindemann
GPG key ID: 3750640C9E25DD61
1 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/python/jw/pkg/cmds/projects/lib/pkg_relations.py
View file

@ -112,38 +112,38 @@ def pkg_relations(
raise Exception('Unknown version specifier in ' + spec) raise Exception('Unknown version specifier in ' + spec)
if len(dep) != 3 or not expand_semver_revision_range: if len(dep) != 3 or not expand_semver_revision_range:
expanded_deps = [dep] expanded_deps = [dep]
continue
assert version is not None
expanded_deps = []
semver = re.split(r'[.-]', version)
if len(semver) != 4:
expanded_deps = [dep]
else: else:
release = int(semver[2]) assert version is not None
major_minor = f'{semver[0]}.{semver[1]}' expanded_deps = []
match dep[1]: semver = re.split(r'[.-]', version)
case '>' | '>=': if len(semver) != 4:
expanded_deps.append([dep[0], dep[1], dep[2]]) expanded_deps = [dep]
expanded_deps.append( else:
[dep[0], '<', f'{major_minor}.{release + 1}'] release = int(semver[2])
) major_minor = f'{semver[0]}.{semver[1]}'
case '<' | '<=': match dep[1]:
expanded_deps.append([dep[0], dep[1], dep[2]]) case '>' | '>=':
case '=': expanded_deps.append([dep[0], dep[1], dep[2]])
expanded_deps.append( expanded_deps.append(
[dep[0], '>=', f'{major_minor}.{release}'] [dep[0], '<', f'{major_minor}.{release + 1}']
) )
expanded_deps.append( case '<' | '<=':
[dep[0], '<', f'{major_minor}.{release + 1}'] expanded_deps.append([dep[0], dep[1], dep[2]])
) case '=':
case _: expanded_deps.append(
raise NotImplementedError( [dep[0], '>=', f'{major_minor}.{release}']
( )
'Expanding SemVer range ' expanded_deps.append(
f'"{dep[0]} {dep[1]} {dep[3]}" ' [dep[0], '<', f'{major_minor}.{release + 1}']
'is not yet implemented' )
case _:
raise NotImplementedError(
(
'Expanding SemVer range '
f'"{dep[0]} {dep[1]} {dep[3]}" '
'is not yet implemented'
)
) )
)
for expanded_dep in expanded_deps: for expanded_dep in expanded_deps:
if hide_self and dep_name in seed_pkgs: if hide_self and dep_name in seed_pkgs:
continue continue