Skip to content

Commit d74d105

Browse files
authored
api cleanups (#101)
* Remove `forbidden*` arguments to api Remove the `forbidden*` arguments to `api` functions that aren't really used and add unnecessary complexity. * Remove priority arguments from `api` Remove the unused `*prorities` parameters to `api` calls. They are not used and add unnecessarily complexity. We are going to focus on config + package priorities instead.
1 parent 4147d47 commit d74d105

File tree

1 file changed

+0
-52
lines changed

1 file changed

+0
-52
lines changed

variantlib/api.py

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
import itertools
66
import logging
77
import pathlib
8-
from typing import TYPE_CHECKING
98

109
from variantlib.configuration import VariantConfiguration
1110
from variantlib.constants import VARIANT_HASH_LEN
1211
from variantlib.constants import VariantsJsonDict
1312
from variantlib.models.provider import ProviderConfig
1413
from variantlib.models.provider import VariantFeatureConfig
1514
from variantlib.models.variant import VariantDescription
16-
from variantlib.models.variant import VariantFeature
1715
from variantlib.models.variant import VariantProperty
1816
from variantlib.models.variant import VariantValidationResult
1917
from variantlib.models.variant_info import VariantInfo
@@ -26,11 +24,6 @@
2624
from variantlib.variant_dist_info import VariantDistInfo
2725
from variantlib.variants_json import VariantsJson
2826

29-
if TYPE_CHECKING:
30-
from variantlib.protocols import VariantFeatureName
31-
from variantlib.protocols import VariantFeatureValue
32-
from variantlib.protocols import VariantNamespace
33-
3427
logger = logging.getLogger(__name__)
3528

3629
__all__ = [
@@ -53,15 +46,6 @@ def get_variant_hashes_by_priority(
5346
use_auto_install: bool = True,
5447
isolated: bool = True,
5548
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,
6549
) -> list[str]:
6650
supported_vprops = []
6751
if not isinstance(variants_json, VariantsJson):
@@ -82,18 +66,6 @@ def get_variant_hashes_by_priority(
8266
)
8367
)
8468

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-
9769
config = VariantConfiguration.get_config()
9870

9971
return [
@@ -102,23 +74,17 @@ def get_variant_hashes_by_priority(
10274
list(variants_json.variants.values()),
10375
supported_vprops,
10476
namespace_priorities=aggregate_namespace_priorities(
105-
namespace_priorities,
10677
config.namespace_priorities,
10778
variants_json.namespace_priorities,
10879
),
10980
feature_priorities=aggregate_feature_priorities(
110-
feature_priorities,
11181
config.feature_priorities,
11282
variants_json.feature_priorities,
11383
),
11484
property_priorities=aggregate_property_priorities(
115-
property_priorities,
11685
config.property_priorities,
11786
variants_json.property_priorities,
11887
),
119-
forbidden_namespaces=forbidden_namespaces,
120-
forbidden_features=_forbidden_features,
121-
forbidden_properties=_forbidden_properties,
12288
)
12389
]
12490

@@ -187,9 +153,6 @@ def check_variant_supported(
187153
use_auto_install: bool = True,
188154
isolated: bool = True,
189155
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,
193156
) -> bool:
194157
"""Check if variant description is supported
195158
@@ -223,28 +186,13 @@ def check_variant_supported(
223186
)
224187
)
225188

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-
238189
VariantConfiguration.get_config()
239190

240191
return bool(
241192
list(
242193
filter_variants(
243194
vdescs=[vdesc],
244195
allowed_properties=supported_vprops,
245-
forbidden_namespaces=forbidden_namespaces,
246-
forbidden_features=_forbidden_features,
247-
forbidden_properties=_forbidden_properties,
248196
)
249197
)
250198
)

0 commit comments

Comments
 (0)