Merge pull request #31 from jreese/enhance

Enhanced package compatibility

Author: thatch

dowsing/setuptools/__init__.py

@@ -96,8 +96,10 @@ def mangle(package: str) -> str:
                     d1.find_packages_include,
                 ):
                     d1.packages_dict[p] = mangle(p)
-            elif d1.packages != "??":
-                assert isinstance(d1.packages, (list, tuple))
+            elif d1.packages not in ("??", "????"):
+                assert isinstance(
+                    d1.packages, (list, tuple)
+                ), f"{d1.packages!r} is not a list/tuple"
                 for p in d1.packages:
                     if p:
                         d1.packages_dict[p] = mangle(p)

dowsing/setuptools/setup_py_parsing.py

@@ -141,7 +141,13 @@ def visit_Call(self, node: cst.Call) -> Optional[bool]:
         # TODO sometimes there is more than one setup call, we might
         # prioritize/merge...
         if any(
-            q.name in ("setuptools.setup", "distutils.core.setup", "setup3lib")
+            q.name
+            in (
+                "setuptools.setup",
+                "distutils.core.setup",
+                "setup3lib",
+                "skbuild.setup",
+            )
             for q in names
         ):
             self.found_setup = True
@@ -177,7 +183,8 @@ def evaluate_in_scope(self, item: cst.CSTNode, scope: Any) -> Any:
 
         if isinstance(item, cst.SimpleString):
             return item.evaluated_value
-        # TODO int/float/etc
+        elif isinstance(item, (cst.Integer, cst.Float)):
+            return int(item.value)
         elif isinstance(item, cst.Name) and item.value in self.BOOL_NAMES:
             return self.BOOL_NAMES[item.value]
         elif isinstance(item, cst.Name):
@@ -277,7 +284,14 @@ def evaluate_in_scope(self, item: cst.CSTNode, scope: Any) -> Any:
             # TODO: Figure out why this is Sequence
             if isinstance(item.slice[0].slice, cst.Index):
                 rhs = self.evaluate_in_scope(item.slice[0].slice.value, scope)
-                return lhs.get(rhs, "??")
+                try:
+                    if isinstance(lhs, dict):
+                        return lhs.get(rhs, "??")
+                    else:
+                        return lhs[rhs]
+                except Exception:
+                    return "??"
+
             else:
                 # LOG.warning(f"Omit2 {type(item.slice[0].slice)!r}")
                 return "??"

dowsing/types.py

@@ -63,6 +63,7 @@ class Distribution(pkginfo.distribution.Distribution):  # type: ignore
     pbr: Optional[bool] = None
     pbr__files__packages_root: Optional[str] = None
     pbr__files__packages: Optional[str] = None
+    provides_extra: Optional[Sequence[str]] = ()
 
     def _getHeaderAttrs(self) -> Sequence[Tuple[str, str, bool]]:
         # Until I invent a metadata version to include this, do so