5
5
import itertools
6
6
import logging
7
7
import pathlib
8
- from typing import TYPE_CHECKING
9
8
10
9
from variantlib .configuration import VariantConfiguration
11
10
from variantlib .constants import VARIANT_HASH_LEN
25
24
from variantlib .variant_dist_info import VariantDistInfo
26
25
from variantlib .variants_json import VariantsJson
27
26
28
- if TYPE_CHECKING :
29
- from variantlib .protocols import VariantFeatureName
30
- from variantlib .protocols import VariantFeatureValue
31
- from variantlib .protocols import VariantNamespace
32
-
33
27
logger = logging .getLogger (__name__ )
34
28
35
29
__all__ = [
@@ -52,12 +46,6 @@ def get_variant_hashes_by_priority(
52
46
use_auto_install : bool = True ,
53
47
isolated : bool = True ,
54
48
venv_path : str | pathlib .Path | None = None ,
55
- namespace_priorities : list [VariantNamespace ] | None = None ,
56
- feature_priorities : dict [VariantNamespace , list [VariantFeatureName ]] | None = None ,
57
- property_priorities : dict [
58
- VariantNamespace , dict [VariantFeatureName , list [VariantFeatureValue ]]
59
- ]
60
- | None = None ,
61
49
) -> list [str ]:
62
50
supported_vprops = []
63
51
if not isinstance (variants_json , VariantsJson ):
@@ -86,17 +74,14 @@ def get_variant_hashes_by_priority(
86
74
list (variants_json .variants .values ()),
87
75
supported_vprops ,
88
76
namespace_priorities = aggregate_namespace_priorities (
89
- namespace_priorities ,
90
77
config .namespace_priorities ,
91
78
variants_json .namespace_priorities ,
92
79
),
93
80
feature_priorities = aggregate_feature_priorities (
94
- feature_priorities ,
95
81
config .feature_priorities ,
96
82
variants_json .feature_priorities ,
97
83
),
98
84
property_priorities = aggregate_property_priorities (
99
- property_priorities ,
100
85
config .property_priorities ,
101
86
variants_json .property_priorities ,
102
87
),
0 commit comments