Skip to content

feat: make create_migration_yaml_creator v1 compatible #3970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
beckermr merged 6 commits into from
Apr 2, 2025
Merged

feat: make create_migration_yaml_creator v1 compatible #3970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
431ebb6
add test for create_migration_yaml_creator, recipe v0
ytausch Apr 1, 2025
40223ad
feat: make create_migration_yaml_creator v1-compatible
ytausch Apr 2, 2025
bdeb3b5
Merge remote-tracking branch 'origin/main' into migration-yaml-creato…
ytausch Apr 2, 2025
aad24b5
docs: add comment for remaining max_pin
ytausch Apr 2, 2025
b63baf5
test: fix test
ytausch Apr 2, 2025
541f1d1
Update conda_forge_tick/make_migrators.py
beckermr Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
318 changes: 195 additions & 123 deletions conda_forge_tick/make_migrators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import typing
from concurrent.futures import as_completed
from typing import (
Any,
List,
Mapping,
MutableMapping,
Expand Down Expand Up @@ -87,9 +88,11 @@
CB_CONFIG,
fold_log_lines,
get_keys_default,
get_recipe_schema_version,
load_existing_graph,
parse_meta_yaml,
parse_munged_run_export,
parse_recipe_yaml,
pluck,
yaml_safe_load,
)
Expand Down Expand Up @@ -553,6 +556,113 @@
print(f"skipping migration {__mname} because it is paused", flush=True)


def _get_max_pin_from_pinning_dict(
pinning_dict: Mapping[str, Any], recipe_version: int
):
"""
Given a pinning dictionary in the format returned by parse_munged_run_export,
return the value for max_pin.

In recipe v0, this is the value of the key "max_pin".
In recipe v1, this is the value of the key "upper_bound", but only if it has the
format of a pinning spec and is not a hard-coded version string.

:return: the value for max_pin, or an empty string if not defined or not a pinning spec.
"""
pinning_spec_regex = re.compile(r"^(x\.)*x$")

if recipe_version == 0:
value = pinning_dict.get("max_pin", "")

Check warning on line 575 in conda_forge_tick/make_migrators.py

View check run for this annotation

Codecov / codecov/patch

conda_forge_tick/make_migrators.py#L575 

Added line #L575 was not covered by tests
elif recipe_version == 1:
value = pinning_dict.get("upper_bound", "")
else:
raise ValueError(f"Unsupported schema version: {recipe_version}")

Check warning on line 579 in conda_forge_tick/make_migrators.py

View check run for this annotation

Codecov / codecov/patch

conda_forge_tick/make_migrators.py#L579 

Added line #L579 was not covered by tests

if pinning_spec_regex.match(value):
return value
return ""

Check warning on line 583 in conda_forge_tick/make_migrators.py

View check run for this annotation

Codecov / codecov/patch

conda_forge_tick/make_migrators.py#L583 

Added line #L583 was not covered by tests


def _extract_most_stringent_pin_from_recipe(
feedstock_name: str,
package_name: str,
feedstock_attrs: Mapping[str, Any],
gx: nx.DiGraph,
) -> tuple[str, list[dict]]:
"""
Given the name of a package that is specified in the run_exports in a feedstock,
find the run_exports pinning specification that is most stringent for that package
in the feedstock recipe.
We do that by considering all run_exports sections from outputs of the feedstock.
The package must also be an output of the feedstock.

:param feedstock_name: name of the feedstock to analyze
:param package_name: name of the package that is specified as run_exports
:param feedstock_attrs: the node attributes of the feedstock
:param gx: an instance of the global cf-graph

:return: a tuple (pin_spec, possible_p_dicts) where pin_spec is the most stringent
pinning spec found and possible_p_dicts is a list of all the run_exports dictionaries
that were found in the recipe, in the format returned by parse_munged_run_export.
If the package is not found in the recipe, pin_spec is an empty string and
possible_p_dicts still contains all the run_exports dictionaries.
"""
schema_version = get_recipe_schema_version(feedstock_attrs)
# we need a special parsing for pinning stuff
if schema_version == 0:
meta_yaml = parse_meta_yaml(
feedstock_attrs["raw_meta_yaml"],
for_pinning=True,
)
elif schema_version == 1:
meta_yaml = parse_recipe_yaml(
feedstock_attrs["raw_meta_yaml"],
for_pinning=True,
)
else:
raise ValueError(f"Unsupported schema version: {schema_version}")

Check warning on line 623 in conda_forge_tick/make_migrators.py

View check run for this annotation

Codecov / codecov/patch

conda_forge_tick/make_migrators.py#L623 

Added line #L623 was not covered by tests
# find the most stringent max pin for this feedstock if any
pin_spec = ""
possible_p_dicts = []
for block in [meta_yaml] + meta_yaml.get("outputs", []) or []:
build = block.get("build", {}) or {}

# parse back to dict
if isinstance(build.get("run_exports", None), MutableMapping):
for _, v in build.get("run_exports", {}).items():
for p in v:
possible_p_dicts.append(parse_munged_run_export(p))
else:
for p in build.get("run_exports", []) or []:
possible_p_dicts.append(parse_munged_run_export(p))

# and check the exported package is within the feedstock
exports = [
_get_max_pin_from_pinning_dict(p, schema_version)
for p in possible_p_dicts
# make certain not direct hard pin
if isinstance(p, MutableMapping)
# ensure the export is for this package
and p.get("package_name", "") == package_name
# ensure the pinned package is in an output of the
# parent feedstock
and (
feedstock_name
in gx.graph["outputs_lut"].get(
p.get("package_name", ""),
set(),
)
)
]
if not exports:
continue
# get the most stringent pin spec from the recipe block
max_pin = max(exports, key=len)
if len(max_pin) > len(pin_spec):
pin_spec = max_pin
return pin_spec, possible_p_dicts


def _outside_pin_range(pin_spec, current_pin, new_version):
pin_level = len(pin_spec.split("."))
current_split = current_pin.split(".")
Expand Down Expand Up @@ -624,140 +734,102 @@
# replace sub-packages with their feedstock names
# TODO - we are grabbing one element almost at random here
# the sorted call makes it stable at least?
fs_name = next(
feedstock_name = next(
iter(
sorted(gx.graph["outputs_lut"].get(package_name, {package_name})),
),
)

if feedstock_name not in gx.nodes:
continue
feedstock_attrs = gx.nodes[feedstock_name]["payload"]

if (
(fs_name in gx.nodes)
and not gx.nodes[fs_name]["payload"].get("archived", False)
and gx.nodes[fs_name]["payload"].get("version")
and fs_name not in feedstocks_to_be_repinned
feedstock_attrs.get("archived", False)
or not feedstock_attrs.get("version")
or feedstock_name in feedstocks_to_be_repinned
):
current_pins = list(map(str, package_pin_list))
current_version = str(gx.nodes[fs_name]["payload"]["version"])
continue

try:
# we need a special parsing for pinning stuff
meta_yaml = parse_meta_yaml(
gx.nodes[fs_name]["payload"]["raw_meta_yaml"],
for_pinning=True,
)
current_pins = list(map(str, package_pin_list))
current_version = str(feedstock_attrs["version"])

# find the most stringent max pin for this feedstock if any
pin_spec = ""
for block in [meta_yaml] + meta_yaml.get("outputs", []) or []:
build = block.get("build", {}) or {}

# parse back to dict
possible_p_dicts = []
if isinstance(build.get("run_exports", None), MutableMapping):
for _, v in build.get("run_exports", {}).items():
for p in v:
possible_p_dicts.append(parse_munged_run_export(p))
else:
for p in build.get("run_exports", []) or []:
possible_p_dicts.append(parse_munged_run_export(p))

# and check the exported package is within the feedstock
exports = [
p.get("max_pin", "")
for p in possible_p_dicts
# make certain not direct hard pin
if isinstance(p, MutableMapping)
# ensure the export is for this package
and p.get("package_name", "") == package_name
# ensure the pinned package is in an output of the
# parent feedstock
and (
fs_name
in gx.graph["outputs_lut"].get(
p.get("package_name", ""),
set(),
)
)
]
if not exports:
continue
# get the most stringent pin spec from the recipe block
max_pin = max(exports, key=len)
if len(max_pin) > len(pin_spec):
pin_spec = max_pin

# fall back to the pinning file or "x"
if not pin_spec:
pin_spec = (
pinnings["pin_run_as_build"]
.get(pinning_name, {})
.get("max_pin", "x")
) or "x"

current_pins = list(
map(lambda x: re.sub("[^0-9.]", "", x).rstrip("."), current_pins),
)
current_pins = [cp.strip() for cp in current_pins if cp.strip() != ""]
current_version = re.sub("[^0-9.]", "", current_version).rstrip(".")
if not current_pins or current_version == "":
continue

current_pin = str(max(map(VersionOrder, current_pins)))
# If the current pin and the current version is the same nothing
# to do even if the pin isn't accurate to the spec
if current_pin != current_version and _outside_pin_range(
pin_spec,
current_pin,
current_version,
):
feedstocks_to_be_repinned.append(fs_name)
with fold_log_lines(
"making pinning migrator for %s" % pinning_name
):
pinnings_together = packages_to_migrate_together.get(
pinning_name, [pinning_name]
)
print(" %s:" % pinning_name, flush=True)
print(" package name:", package_name, flush=True)
print(" feedstock name:", fs_name, flush=True)
for p in possible_p_dicts:
print(" possible pin spec:", p, flush=True)
print(
" migrator:\n"
" curr version: %s\n"
" curr pin: %s\n"
" pin_spec: %s\n"
" pinnings: %s"
% (
current_version,
current_pin,
pin_spec,
pinnings_together,
),
flush=True,
)
migrators.append(
MigrationYamlCreator(
pinning_name,
current_version,
current_pin,
pin_spec,
fs_name,
cfp_gx,
pinnings=pinnings_together,
full_graph=gx,
pr_limit=1,
),
)
except Exception as e:
with fold_log_lines(
"failed to make pinning migrator for %s" % pinning_name
):
try:
pin_spec, possible_p_dicts = _extract_most_stringent_pin_from_recipe(
feedstock_name, package_name, feedstock_attrs, gx
)

# fall back to the pinning file or "x"
if not pin_spec:
# since this comes from conda_build_config.yaml, max_pin is correct for v1 as well
pin_spec = (
pinnings["pin_run_as_build"]
.get(pinning_name, {})
.get("max_pin", "x")
) or "x"

current_pins = list(
map(lambda x: re.sub("[^0-9.]", "", x).rstrip("."), current_pins),
)
current_pins = [cp.strip() for cp in current_pins if cp.strip() != ""]
current_version = re.sub("[^0-9.]", "", current_version).rstrip(".")
if not current_pins or current_version == "":
continue

Check warning on line 777 in conda_forge_tick/make_migrators.py

View check run for this annotation

Codecov / codecov/patch

conda_forge_tick/make_migrators.py#L777 

Added line #L777 was not covered by tests

current_pin = str(max(map(VersionOrder, current_pins)))
# If the current pin and the current version is the same nothing
# to do even if the pin isn't accurate to the spec
if current_pin != current_version and _outside_pin_range(
pin_spec,
current_pin,
current_version,
):
feedstocks_to_be_repinned.append(feedstock_name)
with fold_log_lines("making pinning migrator for %s" % pinning_name):
pinnings_together = packages_to_migrate_together.get(
pinning_name, [pinning_name]
)
print(" %s:" % pinning_name, flush=True)
print(" package name:", package_name, flush=True)
print(" feedstock name:", fs_name, flush=True)
print(" error:", repr(e), flush=True)
continue
print(" feedstock name:", feedstock_name, flush=True)
for p in possible_p_dicts:
print(" possible pin spec:", p, flush=True)
print(
" migrator:\n"
" curr version: %s\n"
" curr pin: %s\n"
" pin_spec: %s\n"
" pinnings: %s"
% (
current_version,
current_pin,
pin_spec,
pinnings_together,
),
flush=True,
)
migrators.append(
MigrationYamlCreator(
pinning_name,
current_version,
current_pin,
pin_spec,
feedstock_name,
cfp_gx,
pinnings=pinnings_together,
full_graph=gx,
pr_limit=1,
),
)
except Exception as e:
with fold_log_lines(

Check warning on line 825 in conda_forge_tick/make_migrators.py

View check run for this annotation

Codecov / codecov/patch

conda_forge_tick/make_migrators.py#L824-L825 

Added lines #L824 - L825 were not covered by tests
"failed to make pinning migrator for %s" % pinning_name
):
print(" %s:" % pinning_name, flush=True)
print(" package name:", package_name, flush=True)
print(" feedstock name:", feedstock_name, flush=True)
print(" error:", repr(e), flush=True)
continue

Check warning on line 832 in conda_forge_tick/make_migrators.py

View check run for this annotation

Codecov / codecov/patch

conda_forge_tick/make_migrators.py#L828-L832 

Added lines #L828 - L832 were not covered by tests


def add_noarch_python_min_migrator(
Expand Down
8 changes: 2 additions & 6 deletions conda_forge_tick/migrators/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
frozen_to_json_friendly,
get_bot_run_url,
get_keys_default,
get_recipe_schema_version,
)

if typing.TYPE_CHECKING:
Expand All @@ -35,12 +36,7 @@ def skip_migrator_due_to_schema(
attrs: "AttrsTypedDict", allowed_schema_versions: List[int]
) -> bool:
__name = attrs.get("name", "")
schema_version = get_keys_default(
attrs,
["meta_yaml", "schema_version"],
{},
0,
)
schema_version = get_recipe_schema_version(attrs)
if schema_version not in allowed_schema_versions:
logger.debug(
"%s: schema version not allowed - %r not in %r",
Expand Down
Loading
⚡