dep: add inverted pkg intersects support for Dep and Cpv objects

Author: radhermit

src/pkgcraft/dep/cpv.pyx

@@ -2,6 +2,7 @@ cimport cython
 
 from .. cimport C
 from .._misc cimport cstring_to_str
+from ..pkg cimport Pkg
 from ..restrict cimport Restrict
 from .cpn cimport Cpn
 from .pkg cimport Dep
@@ -284,7 +285,7 @@ cdef class Cpv:
         """
         return C.pkgcraft_cpv_restrict_matches(self.ptr, r.ptr)
 
-    def intersects(self, other: Cpv | Dep):
+    def intersects(self, other):
         """Determine intersection between two Cpv or Dep objects.
 
         Args:
@@ -306,6 +307,8 @@ cdef class Cpv:
             return C.pkgcraft_cpv_intersects(self.ptr, (<Cpv>other).ptr)
         elif isinstance(other, Dep):
             return C.pkgcraft_cpv_intersects_dep(self.ptr, (<Dep>other).ptr)
+        elif isinstance(other, Pkg):
+            return C.pkgcraft_pkg_intersects_cpv((<Pkg>other).ptr, self.ptr)
         raise TypeError(f"{other.__class__.__name__!r} unsupported type")
 
     def __lt__(self, other):

src/pkgcraft/dep/pkg.pyx

@@ -5,6 +5,7 @@ from cpython.mem cimport PyMem_Free, PyMem_Malloc
 from .. cimport C
 from .._misc cimport SENTINEL, cstring_to_str
 from ..eapi cimport Eapi
+from ..pkg cimport Pkg
 from ..restrict cimport Restrict
 from ..types cimport OrderedFrozenSet
 from .cpn cimport Cpn
@@ -636,7 +637,7 @@ cdef class Dep:
         """
         return C.pkgcraft_dep_restrict_matches(self.ptr, r.ptr)
 
-    def intersects(self, other: Cpv | Dep):
+    def intersects(self, other):
         """Determine intersection between two Cpv or Dep objects.
 
         Args:
@@ -658,6 +659,8 @@ cdef class Dep:
             return C.pkgcraft_dep_intersects(self.ptr, (<Dep>other).ptr)
         elif isinstance(other, Cpv):
             return C.pkgcraft_dep_intersects_cpv(self.ptr, (<Cpv>other).ptr)
+        elif isinstance(other, Pkg):
+            return C.pkgcraft_pkg_intersects_dep((<Pkg>other).ptr, self.ptr)
         raise TypeError(f"{other.__class__.__name__!r} unsupported type")
 
     def __lt__(self, other):

tests/dep/test_cpv.py

@@ -89,7 +89,7 @@ def test_cmp(self):
         with pytest.raises(TypeError):
             assert cpv2 > obj
 
-    def test_intersects(self):
+    def test_intersects(self, fake_repo):
         cpv1 = Cpv("cat/pkg-1")
         cpv2 = Cpv("cat/pkg-2")
 
@@ -103,9 +103,15 @@ def test_intersects(self):
         # unversioned Dep
         assert cpv1.intersects(Dep("cat/pkg"))
 
-        # invalid type
-        with pytest.raises(TypeError):
-            cpv1.intersects(object())
+        # packages
+        pkg = fake_repo.create_pkg("cat/pkg-1")
+        assert cpv1.intersects(pkg)
+        assert not cpv2.intersects(pkg)
+
+        # invalid types
+        for obj in (object(), None):
+            with pytest.raises(TypeError):
+                cpv1.intersects(obj)
 
     def test_hash(self):
         for d in TEST_DATA.toml("version.toml")["hashing"]:

tests/dep/test_pkg.py

@@ -324,7 +324,7 @@ def test_cmp(self):
                 with pytest.raises(TypeError):
                     op_func(obj, None)
 
-    def test_intersects(self):
+    def test_intersects(self, fake_repo):
         for d in TEST_DATA.toml("dep.toml")["intersects"]:
             # test intersections between all pairs of distinct values
             for s1, s2 in permutations(d["vals"], 2):
@@ -340,8 +340,13 @@ def test_intersects(self):
                 else:
                     assert not obj1.intersects(obj2)
 
+        # packages
+        pkg = fake_repo.create_pkg("cat/pkg-1")
+        assert Dep("=cat/pkg-1").intersects(pkg)
+        assert not Dep(">cat/pkg-1").intersects(pkg)
+
         # invalid types
-        for obj in [None, object()]:
+        for obj in (object(), None):
             with pytest.raises(TypeError):
                 Dep("cat/pkg").intersects(obj)