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
12
11
from variantlib .constants import VariantsJsonDict
13
12
from variantlib .models .provider import ProviderConfig
14
13
from variantlib .models .provider import VariantFeatureConfig
15
14
from variantlib .models .variant import VariantDescription
16
- from variantlib .models .variant import VariantFeature
17
15
from variantlib .models .variant import VariantProperty
18
16
from variantlib .models .variant import VariantValidationResult
19
17
from variantlib .models .variant_info import VariantInfo
26
24
from variantlib .variant_dist_info import VariantDistInfo
27
25
from variantlib .variants_json import VariantsJson
28
26
29
- if TYPE_CHECKING :
30
- from variantlib .protocols import VariantFeatureName
31
- from variantlib .protocols import VariantFeatureValue
32
- from variantlib .protocols import VariantNamespace
33
-
34
27
logger = logging .getLogger (__name__ )
35
28
36
29
__all__ = [
@@ -53,15 +46,6 @@ def get_variant_hashes_by_priority(
53
46
use_auto_install : bool = True ,
54
47
isolated : bool = True ,
55
48
venv_path : str | pathlib .Path | None = None ,
56
- namespace_priorities : list [VariantNamespace ] | None = None ,
57
- feature_priorities : dict [VariantNamespace , list [VariantFeatureName ]] | None = None ,
58
- property_priorities : dict [
59
- VariantNamespace , dict [VariantFeatureName , list [VariantFeatureValue ]]
60
- ]
61
- | None = None ,
62
- forbidden_namespaces : list [VariantNamespace ] | None = None ,
63
- forbidden_features : list [str ] | None = None ,
64
- forbidden_properties : list [str ] | None = None ,
65
49
) -> list [str ]:
66
50
supported_vprops = []
67
51
if not isinstance (variants_json , VariantsJson ):
@@ -82,18 +66,6 @@ def get_variant_hashes_by_priority(
82
66
)
83
67
)
84
68
85
- _forbidden_features = (
86
- None
87
- if forbidden_features is None
88
- else [VariantFeature .from_str (vfeat ) for vfeat in forbidden_features ]
89
- )
90
-
91
- _forbidden_properties = (
92
- None
93
- if forbidden_properties is None
94
- else [VariantProperty .from_str (vprop ) for vprop in forbidden_properties ]
95
- )
96
-
97
69
config = VariantConfiguration .get_config ()
98
70
99
71
return [
@@ -102,23 +74,17 @@ def get_variant_hashes_by_priority(
102
74
list (variants_json .variants .values ()),
103
75
supported_vprops ,
104
76
namespace_priorities = aggregate_namespace_priorities (
105
- namespace_priorities ,
106
77
config .namespace_priorities ,
107
78
variants_json .namespace_priorities ,
108
79
),
109
80
feature_priorities = aggregate_feature_priorities (
110
- feature_priorities ,
111
81
config .feature_priorities ,
112
82
variants_json .feature_priorities ,
113
83
),
114
84
property_priorities = aggregate_property_priorities (
115
- property_priorities ,
116
85
config .property_priorities ,
117
86
variants_json .property_priorities ,
118
87
),
119
- forbidden_namespaces = forbidden_namespaces ,
120
- forbidden_features = _forbidden_features ,
121
- forbidden_properties = _forbidden_properties ,
122
88
)
123
89
]
124
90
@@ -187,9 +153,6 @@ def check_variant_supported(
187
153
use_auto_install : bool = True ,
188
154
isolated : bool = True ,
189
155
venv_path : str | pathlib .Path | None = None ,
190
- forbidden_namespaces : list [VariantNamespace ] | None = None ,
191
- forbidden_features : list [str ] | None = None ,
192
- forbidden_properties : list [str ] | None = None ,
193
156
) -> bool :
194
157
"""Check if variant description is supported
195
158
@@ -223,28 +186,13 @@ def check_variant_supported(
223
186
)
224
187
)
225
188
226
- _forbidden_features = (
227
- None
228
- if forbidden_features is None
229
- else [VariantFeature .from_str (vfeat ) for vfeat in forbidden_features ]
230
- )
231
-
232
- _forbidden_properties = (
233
- None
234
- if forbidden_properties is None
235
- else [VariantProperty .from_str (vprop ) for vprop in forbidden_properties ]
236
- )
237
-
238
189
VariantConfiguration .get_config ()
239
190
240
191
return bool (
241
192
list (
242
193
filter_variants (
243
194
vdescs = [vdesc ],
244
195
allowed_properties = supported_vprops ,
245
- forbidden_namespaces = forbidden_namespaces ,
246
- forbidden_features = _forbidden_features ,
247
- forbidden_properties = _forbidden_properties ,
248
196
)
249
197
)
250
198
)
0 commit comments