Merge branch 'main' into fix-broken-tests

Author: thatch

.github/workflows/build.yml

@@ -34,7 +34,6 @@ jobs:
         run: make test
       - name: Lint
         run: make lint
-        if: ${{ matrix.python-version != '3.9' }}
 
   check-deps:
     runs-on: ${{ matrix.os }}

Makefile

@@ -1,4 +1,4 @@
-PYTHON?=python
+PYTHON?=python3
 SOURCES=dowsing setup.py
 
 .PHONY: venv

dowsing/check_source_mapping.py

@@ -6,7 +6,7 @@
 from honesty.archive import extract_and_get_names
 from honesty.cache import Cache
 from honesty.cmdline import select_versions, wrap_async
-from honesty.releases import FileType, async_parse_index
+from honesty.releases import async_parse_index, FileType
 from moreorless.click import echo_color_unified_diff
 
 from dowsing.pep517 import get_metadata

dowsing/maturin.py

@@ -25,7 +25,8 @@ def get_metadata(self) -> Distribution:
 
         cargo = self.path / "Cargo.toml"
         doc = tomlkit.parse(cargo.read_text())
-        for k, v in doc["package"].items():
+        package = doc.get("package", {})
+        for k, v in package.items():
             if k == "name":
                 d.name = v
             elif k == "version":
@@ -39,7 +40,8 @@ def get_metadata(self) -> Distribution:
             # homepage
             # readme (filename)
 
-        for k, v in doc["package"]["metadata"]["maturin"].items():
+        maturin = package.get("metadata", {}).get("maturin", {})
+        for k, v in maturin.items():
             if k == "requires-python":
                 d.requires_python = v
             elif k == "classifier":

dowsing/pep517.py

@@ -11,6 +11,7 @@
 KNOWN_BACKENDS: Dict[str, str] = {
     "setuptools.build_meta:__legacy__": "dowsing.setuptools:SetuptoolsReader",
     "setuptools.build_meta": "dowsing.setuptools:SetuptoolsReader",
+    "jupyter_packaging.build_api": "dowsing.setuptools:SetuptoolsReader",
     "flit_core.buildapi": "dowsing.flit:FlitReader",
     "flit.buildapi": "dowsing.flit:FlitReader",
     "maturin": "dowsing.maturin:MaturinReader",
@@ -26,13 +27,14 @@ def get_backend(path: Path) -> Tuple[List[str], BaseReader]:
     requires: List[str] = []
     if pyproject.exists():
         doc = tomlkit.parse(pyproject.read_text())
-        if "build-system" in doc:
-            # 1b. include any build-system requires
-            if "requires" in doc["build-system"]:
-                requires.extend(doc["build-system"]["requires"])
-            if "build-backend" in doc["build-system"]:
-                backend = doc["build-system"]["build-backend"]
-            # TODO backend-path
+        table = doc.get("build-system", {})
+
+        # 1b. include any build-system requires
+        if "requires" in table:
+            requires.extend(table["requires"])
+        if "build-backend" in table:
+            backend = table["build-backend"]
+        # TODO backend-path
 
     try:
         backend_path = KNOWN_BACKENDS[backend]

dowsing/poetry.py

@@ -42,7 +42,8 @@ def get_metadata(self) -> Distribution:
         d.packages = []
         d.packages_dict = {}
 
-        for k, v in doc["tool"]["poetry"].items():
+        poetry = doc.get("tool", {}).get("poetry", {})
+        for k, v in poetry.items():
             if k in ("homepage", "repository", "documentation"):
                 d.project_urls[k] = v
             elif k == "packages":
@@ -64,16 +65,16 @@ def get_metadata(self) -> Distribution:
                 d.packages_dict[p] = p.replace(".", "/")
                 d.packages.append(p)
 
-        for k, v in doc["tool"]["poetry"].get("dependencies", {}).items():
+        for k, v in poetry.get("dependencies", {}).items():
             if k == "python":
                 pass  # TODO translate to requires_python
             else:
                 d.requires_dist.append(k)  # TODO something with version
 
-        for k, v in doc["tool"]["poetry"].get("urls", {}).items():
+        for k, v in poetry.get("urls", {}).items():
             d.project_urls[k] = v
 
-        for k, v in doc["tool"]["poetry"].get("scripts", {}).items():
+        for k, v in poetry.get("scripts", {}).items():
             d.entry_points[k] = v
 
         d.source_mapping = d._source_mapping(self.path)

dowsing/setuptools/__init__.py

@@ -61,7 +61,7 @@ def get_metadata(self) -> Distribution:
         # https://docs.python.org/2/distutils/setupscript.html#listing-whole-packages
         package_dir: Mapping[str, str] = d1.package_dir
         # If there was an error, we might have written "??"
-        if package_dir != "??":
+        if package_dir != "??":  # type: ignore
             if not package_dir:
                 package_dir = {"": "."}
 

dowsing/setuptools/setup_py_parsing.py

@@ -92,7 +92,7 @@ def __init__(self, filename: str) -> None:
 
 
 class SetupCallTransformer(cst.CSTTransformer):
-    METADATA_DEPENDENCIES = (ScopeProvider, ParentNodeProvider, QualifiedNameProvider)  # type: ignore
+    METADATA_DEPENDENCIES = (ScopeProvider, ParentNodeProvider, QualifiedNameProvider)
 
     def __init__(
         self,
@@ -124,7 +124,7 @@ def leave_Call(
 
 
 class SetupCallAnalyzer(cst.CSTVisitor):
-    METADATA_DEPENDENCIES = (ScopeProvider, ParentNodeProvider, QualifiedNameProvider)  # type: ignore
+    METADATA_DEPENDENCIES = (ScopeProvider, ParentNodeProvider, QualifiedNameProvider)
 
     # TODO names resulting from other than 'from setuptools import setup'
     # TODO wrapper funcs that modify args

requirements-dev.txt

@@ -1,12 +1,12 @@
-black==21.12b0
+black==22.1.0
 click==8.0.3
 coverage==4.5.4
 flake8==3.7.9
-mypy==0.750
+mypy==0.931
 tox==3.24.5
 twine==3.1.1
-ufmt==1.1
-usort==0.6.3
+ufmt==1.3.1.post1
+usort==1.0.1
 volatile==2.1.0
 wheel==0.37.1
-honesty==0.3.0a1
+honesty==0.3.0a2

requirements.txt

@@ -1,5 +1,6 @@
 highlighter==0.1.1
 imperfect==0.3.0
 LibCST==0.3.12
-tomlkit==0.7.0
-pkginfo==1.5.0.1
+tomlkit==0.9.0
+pkginfo==1.8.1
+dataclasses==0.8; python_version<"3.7"