commit: 2e8c66a0cd0bf7ef7616235459f6294e473f696b
Author: Brian Harring <ferringb <AT> gmail <DOT> com>
AuthorDate: Sat Oct 25 12:01:55 2025 +0000
Commit: Brian Harring <ferringb <AT> gmail <DOT> com>
CommitDate: Sat Nov 22 00:47:31 2025 +0000
URL:
https://gitweb.gentoo.org/proj/pkgcore/pkgcore.git/commit/?id=2e8c66a0
chore: s/is_supported/supported for naming sanity
Signed-off-by: Brian Harring <ferringb <AT> gmail.com>
src/pkgcore/ebuild/domain.py | 2 +-
src/pkgcore/ebuild/eapi.py | 12 +++++-------
src/pkgcore/ebuild/ebd.py | 2 +-
src/pkgcore/ebuild/ebuild_src.py | 7 +++----
src/pkgcore/ebuild/repo_objs.py | 2 +-
src/pkgcore/ebuild/repository.py | 9 ++++-----
src/pkgcore/package/base.py | 4 ++--
src/pkgcore/repository/configured.py | 2 +-
src/pkgcore/repository/prototype.py | 2 +-
src/pkgcore/repository/virtual.py | 2 +-
tests/ebuild/test_eapi.py | 10 +++++-----
tests/ebuild/test_ebuild_src.py | 11 ++++++-----
tests/pkgsets/test_installed.py | 2 +-
13 files changed, 32 insertions(+), 35 deletions(-)
diff --git a/src/pkgcore/ebuild/domain.py b/src/pkgcore/ebuild/domain.py
index ca34ea19..0fe1765d 100644
--- a/src/pkgcore/ebuild/domain.py
+++ b/src/pkgcore/ebuild/domain.py
@@ -885,7 +885,7 @@ class domain(config_domain):
for r in self.__repos:
try:
repo = r.instantiate()
- if not repo.is_supported:
+ if not repo.supported:
logger.warning(
f"skipping {r.name!r} repo: unsupported EAPI
{str(repo.eapi)!r}"
)
diff --git a/src/pkgcore/ebuild/eapi.py b/src/pkgcore/ebuild/eapi.py
index 185bd87a..8a26c1ae 100644
--- a/src/pkgcore/ebuild/eapi.py
+++ b/src/pkgcore/ebuild/eapi.py
@@ -80,7 +80,7 @@ eapi_optionals = ImmutableDict(
"has_KV": True,
# Controls whether or not pkgcore, or extensions loaded, actually fully
# support this EAPI.
- "is_supported": True,
+ "supported": True,
# Controls whether IUSE defaults are supported; see PMS.
"iuse_defaults": False,
# Controls whether new* style bash functions can take their content
input
@@ -223,10 +223,10 @@ class EAPI(metaclass=klass.immutable_instance):
magic: str = property(attrgetter("_magic")) # pyright:
ignore[reportAssignmentType]
@klass.jit_attr
- def is_supported(self):
+ def supported(self):
"""Check if an EAPI is supported."""
if EAPI.known_eapis.get(self.magic) is not None:
- if not self.options.is_supported:
+ if not self.options.supported:
logger.warning(f"EAPI '{self}' isn't fully supported")
sys.stderr.flush()
return True
@@ -491,7 +491,7 @@ def get_eapi(magic, suppress_unsupported=True):
if eapi is None and suppress_unsupported:
eapi = EAPI.unknown_eapis.get(magic)
if eapi is None:
- eapi = EAPI(magic=magic, optionals={"is_supported": False})
+ eapi = EAPI(magic=magic, optionals={"supported": False})
EAPI.unknown_eapis[eapi.magic] = eapi
return eapi
@@ -862,8 +862,6 @@ eapi9 = EAPI.register(
eclass_keys=eapi8.eclass_keys,
tracked_attributes=eapi8.tracked_attributes,
archive_exts=eapi8.archive_exts,
- optionals=_combine_dicts(
- eapi8.options, dict(bash_compat="5.2", is_supported=False)
- ),
+ optionals=_combine_dicts(eapi8.options, dict(bash_compat="5.2",
supported=False)),
ebd_env_options=eapi8._ebd_env_options,
)
diff --git a/src/pkgcore/ebuild/ebd.py b/src/pkgcore/ebuild/ebd.py
index 34158970..a6b0c87e 100644
--- a/src/pkgcore/ebuild/ebd.py
+++ b/src/pkgcore/ebuild/ebd.py
@@ -81,7 +81,7 @@ class ebd:
if not hasattr(self, "observer"):
self.observer = observer
- if not self.eapi.is_supported:
+ if not self.eapi.supported:
raise TypeError(f"package {pkg} uses unsupported EAPI:
{str(self.eapi)!r}")
if initial_env is not None:
diff --git a/src/pkgcore/ebuild/ebuild_src.py b/src/pkgcore/ebuild/ebuild_src.py
index 6d5f8e45..bcbfd262 100644
--- a/src/pkgcore/ebuild/ebuild_src.py
+++ b/src/pkgcore/ebuild/ebuild_src.py
@@ -20,9 +20,8 @@ from ..package import errors as metadata_errors
from ..package import metadata
from ..package.base import DynamicGetattrSetter
from ..restrictions import boolean, values
-from . import conditionals
+from . import conditionals, processor
from . import errors as ebuild_errors
-from . import processor
from .atom import atom
from .eapi import get_eapi
from .misc import sort_keywords
@@ -302,7 +301,7 @@ class base(metadata.package):
error = str(e) if eapi else f"{e}: {eapi_str!r}"
raise metadata_errors.MetadataException(self, "eapi", error)
- is_supported = klass.alias_attr("eapi.is_supported")
+ supported = klass.alias_attr("eapi.supported")
tracked_attributes = klass.alias_attr("eapi.tracked_attributes")
@DynamicGetattrSetter.register
@@ -517,7 +516,7 @@ class package_factory(metadata.factory):
def _update_metadata(self, pkg, ebp=None):
parsed_eapi = pkg.eapi
- if not parsed_eapi.is_supported:
+ if not parsed_eapi.supported:
return {"EAPI": str(parsed_eapi)}
with processor.reuse_or_request(ebp) as my_proc:
diff --git a/src/pkgcore/ebuild/repo_objs.py b/src/pkgcore/ebuild/repo_objs.py
index 47422dc1..1eb72148 100644
--- a/src/pkgcore/ebuild/repo_objs.py
+++ b/src/pkgcore/ebuild/repo_objs.py
@@ -773,7 +773,7 @@ class RepoConfig(syncable.tree, klass.ImmutableInstance,
metaclass=WeakInstMeta)
except OSError as e:
raise repo_errors.InitializationError(str(e))
- if not self.eapi.is_supported:
+ if not self.eapi.supported:
raise repo_errors.UnsupportedRepo(self)
def _parse_config(self):
diff --git a/src/pkgcore/ebuild/repository.py b/src/pkgcore/ebuild/repository.py
index 18a6f0ca..23cf2df4 100644
--- a/src/pkgcore/ebuild/repository.py
+++ b/src/pkgcore/ebuild/repository.py
@@ -33,10 +33,9 @@ from ..repository import configured, errors, prototype, util
from ..repository.virtual import RestrictionRepo
from ..restrictions import packages
from ..util import packages as pkgutils
-from . import cpv, digest, ebd, ebuild_src
+from . import cpv, digest, ebd, ebuild_src, processor, repo_objs, restricts
from . import eclass_cache as eclass_cache_mod
from . import errors as ebuild_errors
-from . import processor, repo_objs, restricts
from .atom import atom
from .eapi import get_eapi
@@ -341,7 +340,7 @@ class UnconfiguredTree(prototype.tree):
)
# verify we support the repo's EAPI
- if not self.is_supported:
+ if not self.supported:
raise errors.UnsupportedRepo(self)
if eclass_cache is None:
@@ -386,7 +385,7 @@ class UnconfiguredTree(prototype.tree):
repo_name = klass.alias_attr("config.repo_name")
aliases = klass.alias_attr("config.aliases")
eapi = klass.alias_attr("config.eapi")
- is_supported = klass.alias_attr("config.eapi.is_supported")
+ supported = klass.alias_attr("config.eapi.supported")
external = klass.alias_attr("config.external")
pkg_masks = klass.alias_attr("config.pkg_masks")
@@ -583,7 +582,7 @@ class UnconfiguredTree(prototype.tree):
else:
# check pkgs for unsupported/invalid EAPIs and bad metadata
try:
- if not pkg.is_supported:
+ if not pkg.supported:
exc = pkg_errors.MetadataException(
pkg, "eapi", f"EAPI '{pkg.eapi}' is not supported"
)
diff --git a/src/pkgcore/package/base.py b/src/pkgcore/package/base.py
index b04b5813..19185c62 100644
--- a/src/pkgcore/package/base.py
+++ b/src/pkgcore/package/base.py
@@ -34,7 +34,7 @@ class base(klass.SlotsPicklingMixin,
metaclass=klass.immutable_instance):
return self._operations(domain, self, **kwds)
@property
- def is_supported(self):
+ def supported(self):
return True
@@ -81,7 +81,7 @@ class wrapper(base):
built = klass.alias_attr("_raw_pkg.built")
versioned_atom = klass.alias_attr("_raw_pkg.versioned_atom")
unversioned_atom = klass.alias_attr("_raw_pkg.unversioned_atom")
- is_supported = klass.alias_attr("_raw_pkg.is_supported")
+ supported = klass.alias_attr("_raw_pkg.supported")
def __hash__(self):
return hash(self._raw_pkg)
diff --git a/src/pkgcore/repository/configured.py
b/src/pkgcore/repository/configured.py
index 2860a59f..81f62286 100644
--- a/src/pkgcore/repository/configured.py
+++ b/src/pkgcore/repository/configured.py
@@ -72,7 +72,7 @@ class tree(prototype.tree):
def __getitem__(self, key):
obj = self.package_class(self.raw_repo[key])
- if not obj.is_supported:
+ if not obj.supported:
raise KeyError(key)
return obj
diff --git a/src/pkgcore/repository/prototype.py
b/src/pkgcore/repository/prototype.py
index a07aa946..2c8cf5df 100644
--- a/src/pkgcore/repository/prototype.py
+++ b/src/pkgcore/repository/prototype.py
@@ -122,7 +122,7 @@ class tree:
"""
raw_repo = None
- is_supported = True
+ supported = True
livefs = False
package_class = None
configured = True
diff --git a/src/pkgcore/repository/virtual.py
b/src/pkgcore/repository/virtual.py
index 12e8d972..8f2cabb9 100644
--- a/src/pkgcore/repository/virtual.py
+++ b/src/pkgcore/repository/virtual.py
@@ -72,7 +72,7 @@ class InjectedPkg(pkg_base.wrapper):
default_idepend
) = DepSet()
package_is_real = False
- is_supported = True
+ supported = True
def __init__(self, raw_pkg, repo, data=None):
pkg_base.wrapper.__init__(self, raw_pkg)
diff --git a/tests/ebuild/test_eapi.py b/tests/ebuild/test_eapi.py
index 66939c55..d07aed10 100644
--- a/tests/ebuild/test_eapi.py
+++ b/tests/ebuild/test_eapi.py
@@ -49,8 +49,8 @@ class TestEAPI:
test_eapi = EAPI.register(magic="test1", optionals={"bash_compat":
"4.1"})
assert test_eapi.magic == "test1"
- def test_is_supported(self, tmp_path, caplog):
- assert eapi6.is_supported
+ def test_supported(self, tmp_path, caplog):
+ assert eapi6.supported
mock_ebd_temp = str(shutil.copytree(EBD_PATH, tmp_path / "ebd"))
with (
@@ -58,13 +58,13 @@ class TestEAPI:
mock.patch("pkgcore.ebuild.eapi.const.EBD_PATH", mock_ebd_temp),
):
# partially supported EAPI is flagged as such
- test_eapi = EAPI.register("test", optionals={"is_supported":
False})
- assert test_eapi.is_supported
+ test_eapi = EAPI.register("test", optionals={"supported": False})
+ assert test_eapi.supported
assert caplog.text.endswith("EAPI 'test' isn't fully supported\n")
# unsupported/unknown EAPI is flagged as such
unknown_eapi = get_eapi("blah")
- assert not unknown_eapi.is_supported
+ assert not unknown_eapi.supported
def test_inherits(self):
for eapi_str, eapi_obj in EAPI.known_eapis.items():
diff --git a/tests/ebuild/test_ebuild_src.py b/tests/ebuild/test_ebuild_src.py
index 70c1070e..f1e0f329 100644
--- a/tests/ebuild/test_ebuild_src.py
+++ b/tests/ebuild/test_ebuild_src.py
@@ -4,13 +4,14 @@ from functools import partial
from types import SimpleNamespace
import pytest
+from snakeoil.currying import post_curry
+from snakeoil.data_source import data_source, local_source
+from snakeoil.osutils import pjoin
+
from pkgcore import fetch
from pkgcore.ebuild import digest, ebuild_src, repo_objs
from pkgcore.ebuild.eapi import EAPI, get_eapi
from pkgcore.package import errors
-from snakeoil.currying import post_curry
-from snakeoil.data_source import data_source, local_source
-from snakeoil.osutils import pjoin
from .test_eclass_cache import FakeEclassCache
@@ -215,8 +216,8 @@ class TestBase:
def test_eapi(self):
assert str(self.get_pkg({"EAPI": "0"}).eapi) == "0"
- assert self.get_pkg({"EAPI": "0"}).eapi.is_supported
- assert not self.get_pkg({"EAPI": "0.1"}).eapi.is_supported
+ assert self.get_pkg({"EAPI": "0"}).eapi.supported
+ assert not self.get_pkg({"EAPI": "0.1"}).eapi.supported
assert self.get_pkg({"EAPI": "foon"}, suppress_unsupported=False).eapi
is None
with pytest.raises(errors.MetadataException):
getattr(self.get_pkg({"EAPI": 0, "DEPEND": "d/b:0"}), "depend")
diff --git a/tests/pkgsets/test_installed.py b/tests/pkgsets/test_installed.py
index 990388ab..f90e1e8a 100644
--- a/tests/pkgsets/test_installed.py
+++ b/tests/pkgsets/test_installed.py
@@ -4,7 +4,7 @@ from pkgcore.repository.util import SimpleTree
class FakePkg:
package_is_real = True
- is_supported = True
+ supported = True
def __init__(self, cat, pn, ver):
self.cat = cat
