diff --git a/src/python/jw/pkg/cmds/projects/lib/pkg_relations.py b/src/python/jw/pkg/cmds/projects/lib/pkg_relations.py index b3ee1a68..9bdcbecc 100644 --- a/src/python/jw/pkg/cmds/projects/lib/pkg_relations.py +++ b/src/python/jw/pkg/cmds/projects/lib/pkg_relations.py @@ -112,38 +112,38 @@ def pkg_relations( raise Exception('Unknown version specifier in ' + spec) if len(dep) != 3 or not expand_semver_revision_range: expanded_deps = [dep] - continue - assert version is not None - expanded_deps = [] - semver = re.split(r'[.-]', version) - if len(semver) != 4: - expanded_deps = [dep] else: - release = int(semver[2]) - major_minor = f'{semver[0]}.{semver[1]}' - match dep[1]: - case '>' | '>=': - expanded_deps.append([dep[0], dep[1], dep[2]]) - expanded_deps.append( - [dep[0], '<', f'{major_minor}.{release + 1}'] - ) - case '<' | '<=': - expanded_deps.append([dep[0], dep[1], dep[2]]) - case '=': - expanded_deps.append( - [dep[0], '>=', f'{major_minor}.{release}'] - ) - expanded_deps.append( - [dep[0], '<', f'{major_minor}.{release + 1}'] - ) - case _: - raise NotImplementedError( - ( - 'Expanding SemVer range ' - f'"{dep[0]} {dep[1]} {dep[3]}" ' - 'is not yet implemented' + assert version is not None + expanded_deps = [] + semver = re.split(r'[.-]', version) + if len(semver) != 4: + expanded_deps = [dep] + else: + release = int(semver[2]) + major_minor = f'{semver[0]}.{semver[1]}' + match dep[1]: + case '>' | '>=': + expanded_deps.append([dep[0], dep[1], dep[2]]) + expanded_deps.append( + [dep[0], '<', f'{major_minor}.{release + 1}'] + ) + case '<' | '<=': + expanded_deps.append([dep[0], dep[1], dep[2]]) + case '=': + expanded_deps.append( + [dep[0], '>=', f'{major_minor}.{release}'] + ) + expanded_deps.append( + [dep[0], '<', f'{major_minor}.{release + 1}'] + ) + case _: + raise NotImplementedError( + ( + 'Expanding SemVer range ' + f'"{dep[0]} {dep[1]} {dep[3]}" ' + 'is not yet implemented' + ) ) - ) for expanded_dep in expanded_deps: if hide_self and dep_name in seed_pkgs: continue