fixup! EAPI: add functionality for handling PMS eapis

Author: ferringb

src/pkgcore/ebuild/eapi.py

@@ -378,8 +378,8 @@ def bash_libs(self):
                     )
             except (IOError, subprocess.CalledProcessError) as e:
                 raise Exception(
-                    f"failed to generate EAPI '{self}' global lib: {str(e)}"
-                )
+                    f"failed to generate EAPI '{self}'"
+                ) from e
 
         for phase in self.phases.values():
             eapi_lib = pjoin(const.EBD_PATH, ".generated", "libs", self._magic, phase)
@@ -394,8 +394,8 @@ def bash_libs(self):
                         )
                 except (IOError, subprocess.CalledProcessError) as e:
                     raise Exception(
-                        f"failed to generate EAPI '{self}' phase {phase} lib: {str(e)}"
-                    )
+                        f"failed to generate EAPI '{self}' phase {phase}"
+                    ) from e
 
     @klass.jit_attr
     def archive_exts_regex_pattern(self):

tests/ebuild/test_eapi.py

@@ -3,7 +3,7 @@
 
 import pytest
 from pkgcore.const import EBD_PATH
-from pkgcore.ebuild import eapi
+from pkgcore.ebuild import eapi as eapi_mod
 from pkgcore.ebuild.eapi import EAPI, get_eapi
 
 
@@ -43,36 +43,36 @@ def test_get_eapi():
     assert unknown_eapi == get_eapi("unknown")
 
     # known EAPI
-    assert get_eapi("6") == eapi.eapi6
+    assert get_eapi("6") == eapi_mod.eapi6
 
 
 def test_get_PMS_eapi():
     # test PMS filtration
-    assert get_eapi("6") is eapi.eapi6
+    assert get_eapi("6") is eapi_mod.eapi6
     # hold the reference, known_eapis is weakval
     temp = EAPI.register("1234")
     # confirm it's visable
     assert get_eapi("1234", suppress_unsupported=False) is temp
-    assert eapi.get_PMS_eapi("1234") is None
+    assert eapi_mod.get_PMS_eapi("1234") is None
     temp2 = EAPI.register("9999", pms=True)
-    assert eapi.get_PMS_eapi("9999") is temp2
+    assert eapi_mod.get_PMS_eapi("9999") is temp2
 
 
 def test_get_PMS_eapis():
-    pms_eapis = set(eapi.get_PMS_eapis())
+    pms_eapis = set(eapi_mod.get_PMS_eapis())
     expected = set(x for x in EAPI.known_eapis.values() if x.pms)
     assert pms_eapis == expected
 
 
 def test_get_latest_pms_eapi():
     # if it's not in there, the magic constant isn't in alignment
-    assert eapi.get_latest_PMS_eapi() in list(eapi.get_PMS_eapis())
+    assert eapi_mod.get_latest_PMS_eapi() in list(eapi_mod.get_PMS_eapis())
 
     # Note, this can false positive while a new  EAPI is being developed.  If this
     # is an actual issue, then introduce a flag on EAPI objects that indicates 'latest pms',
     # and update get_latest_PMS_eapi to scan for that, and register() to block duplicate.
     assert (
-        eapi.get_latest_PMS_eapi()
+        eapi_mod.get_latest_PMS_eapi()
         is sorted(
             (x for x in EAPI.known_eapis.values() if x.pms),
             key=lambda e: int(e._magic),
@@ -94,7 +94,7 @@ def test_register(self, tmp_path):
         mock_ebd_temp = str(shutil.copytree(EBD_PATH, tmp_path / "ebd"))
         with (
             mock.patch("pkgcore.ebuild.eapi.bash_version") as bash_version,
-            mock.patch.dict(eapi.EAPI.known_eapis),
+            mock.patch.dict(eapi_mod.EAPI.known_eapis),
             mock.patch("pkgcore.ebuild.eapi.const.EBD_PATH", mock_ebd_temp),
         ):
             # inadequate bash version
@@ -115,11 +115,11 @@ def test_register(self, tmp_path):
             assert test_eapi._magic == "test1"
 
     def test_is_supported(self, tmp_path, caplog):
-        assert eapi.eapi6.is_supported
+        assert eapi_mod.eapi6.is_supported
 
         mock_ebd_temp = str(shutil.copytree(EBD_PATH, tmp_path / "ebd"))
         with (
-            mock.patch.dict(eapi.EAPI.known_eapis),
+            mock.patch.dict(eapi_mod.EAPI.known_eapis),
             mock.patch("pkgcore.ebuild.eapi.const.EBD_PATH", mock_ebd_temp),
         ):
             # partially supported EAPI is flagged as such