From 36354ebcbea87d7d4a573cc1fd249e0d8cbe1c4b Mon Sep 17 00:00:00 2001 From: Adrian Freund Date: Thu, 1 Aug 2024 14:59:43 +0200 Subject: [PATCH] Replace HashableDict with frozendict.deepfreeze HashableDict has been removed from conda_build in 24.7 and has been deprecated since 24.5. This removed the need to to pin conda_build to <24.7 --- .ci_support/compute_build_graph.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.ci_support/compute_build_graph.py b/.ci_support/compute_build_graph.py index 060d2ef8a6dff..0fcb04a108eb7 100644 --- a/.ci_support/compute_build_graph.py +++ b/.ci_support/compute_build_graph.py @@ -39,15 +39,13 @@ import functools from functools import lru_cache -from frozendict import frozendict +from frozendict import frozendict, deepfreeze import networkx as nx from conda.models.match_spec import MatchSpec from conda.models.records import PackageRecord from conda_build import api from conda_build.metadata import find_recipe, MetaData -from conda_build.utils import HashableDict - log = logging.getLogger(__file__) CONDA_BUILD_CACHE = os.environ.get("CONDA_BUILD_CACHE") @@ -347,7 +345,7 @@ def collapse_subpackage_nodes(graph): if master_meta.name() == meta.name(): master = True group = node_groups.get(meta_path, {}) - subgroup = group.get(HashableDict(meta.config.variant), {}) + subgroup = group.get(deepfreeze(meta.config.variant), {}) if master: if 'master' in subgroup: raise ValueError("tried to set more than one node in a group as master") @@ -356,7 +354,7 @@ def collapse_subpackage_nodes(graph): sps = subgroup.get('subpackages', []) sps.append(node) subgroup['subpackages'] = sps - group[HashableDict(meta.config.variant)] = subgroup + group[deepfreeze(meta.config.variant)] = subgroup node_groups[meta_path] = group for recipe_path, group in node_groups.items():