Upgrade testing dependencies, fix types

Author: thatch

dowsing/_demo_pep517.py

@@ -1,6 +1,7 @@
 """
 For testing, dump the requirements that we find using the pep517 project.
 """
+
 import json
 import sys
 
@@ -19,12 +20,12 @@ def main(path: str) -> None:
     d = {}
     with BuildEnvironment() as env:
         env.pip_install(requires)
-        d[
-            "get_requires_for_build_sdist"
-        ] = requires + hooks.get_requires_for_build_sdist(None)
-        d[
-            "get_requires_for_build_wheel"
-        ] = requires + hooks.get_requires_for_build_wheel(None)
+        d["get_requires_for_build_sdist"] = (
+            requires + hooks.get_requires_for_build_sdist(None)
+        )
+        d["get_requires_for_build_wheel"] = (
+            requires + hooks.get_requires_for_build_wheel(None)
+        )
 
     print(json.dumps(d))
 

dowsing/flit.py

@@ -24,6 +24,9 @@ def get_metadata(self) -> Distribution:
 
         d = self.get_pep621_metadata()
         d.entry_points = dict(d.entry_points) or {}
+        d.project_urls = list(d.project_urls)
+
+        assert isinstance(d.project_urls, list)
 
         flit = doc.get("tool", {}).get("flit", {})
         metadata = flit.get("metadata", {})
@@ -33,7 +36,7 @@ def get_metadata(self) -> Distribution:
             # TODO requires -> requires_dist
             # TODO tool.flit.metadata.urls
             if k == "home-page":
-                d.project_urls["Homepage"] = v
+                d.project_urls.append("Homepage={v}")
                 continue
             elif k == "module":
                 if (self.path / f"{v}.py").exists():

dowsing/pep621.py

@@ -11,12 +11,14 @@ def get_pep621_metadata(self) -> Distribution:
 
         d = Distribution()
         d.metadata_version = "2.1"
-        d.project_urls = {}
+        d.project_urls = []
         d.entry_points = {}
         d.requires_dist = []
         d.packages = []
         d.packages_dict = {}
 
+        assert isinstance(d.project_urls, list)
+
         table = doc.get("project", None)
         if table:
             for k, v in table.items():
@@ -40,7 +42,7 @@ def get_pep621_metadata(self) -> Distribution:
                 elif k == "optional-dependencies":
                     pass
                 elif k == "urls":
-                    d.project_urls.update(v)
+                    d.project_urls.extend(v)
 
                 k2 = k.replace("-", "_")
                 if k2 in d:

dowsing/poetry.py

@@ -36,16 +36,18 @@ def get_metadata(self) -> Distribution:
 
         d = Distribution()
         d.metadata_version = "2.1"
-        d.project_urls = {}
+        d.project_urls = []
         d.entry_points = {}
         d.requires_dist = []
         d.packages = []
         d.packages_dict = {}
 
+        assert isinstance(d.project_urls, list)
+
         poetry = doc.get("tool", {}).get("poetry", {})
         for k, v in poetry.items():
             if k in ("homepage", "repository", "documentation"):
-                d.project_urls[k] = v
+                d.project_urls.append(f"{k}={v}")
             elif k == "packages":
                 # TODO improve and add tests; this works for tf2_utils and
                 # poetry itself but include can be a glob and there are excludes
@@ -72,7 +74,7 @@ def get_metadata(self) -> Distribution:
                 d.requires_dist.append(k)  # TODO something with version
 
         for k, v in poetry.get("urls", {}).items():
-            d.project_urls[k] = v
+            d.project_urls.append(f"{k}={v}")
 
         for k, v in poetry.get("scripts", {}).items():
             d.entry_points[k] = v

dowsing/tests/setuptools_metadata.py

@@ -43,8 +43,8 @@ def egg_info(files: Dict[str, str]) -> Tuple[Message, Distribution]:
             parser = email.parser.Parser()
             info = parser.parse(f)
         reader = SetuptoolsReader(Path(d))
-        dist = reader.get_metadata()
-        return info, dist
+        dist = reader.get_metadata()  # type: ignore[assignment]
+        return info, dist  # type: ignore[return-value]
 
 
 # These tests do not increase coverage, and just verify that we have the right
@@ -97,8 +97,8 @@ def test_arg_mapping(self) -> None:
                     # setuptools>=57 writes long_description to the body/payload
                     # of PKG-INFO, and skips the description field entirely.
                     if field.keyword == "long_description" and a is None:
-                        a = setup_py_info.get_payload()
-                        b = setup_cfg_info.get_payload()
+                        a = setup_py_info.get_payload()  # type: ignore[assignment]
+                        b = setup_cfg_info.get_payload()  # type: ignore[assignment]
 
                     # install_requires gets written out to *.egg-info/requires.txt
                     # instead

dowsing/types.py

@@ -37,9 +37,8 @@ def get_metadata(self) -> "Distribution":
 
 DEFAULT_EMPTY_DICT: Mapping[str, Any] = MappingProxyType({})
 
-# TODO: pkginfo isn't typed, and is doing to require a yak-shave to send a PR
-# since it's on launchpad.
-class Distribution(pkginfo.distribution.Distribution):  # type: ignore
+
+class Distribution(pkginfo.distribution.Distribution):
     # These are not actually part of the metadata, see PEP 566
     setup_requires: Sequence[str] = ()
     tests_require: Sequence[str] = ()
@@ -68,7 +67,8 @@ class Distribution(pkginfo.distribution.Distribution):  # type: ignore
     def _getHeaderAttrs(self) -> Sequence[Tuple[str, str, bool]]:
         # Until I invent a metadata version to include this, do so
         # unconditionally.
-        return tuple(super()._getHeaderAttrs()) + (
+        # Stubs are wrong, this does too exist.
+        return tuple(super()._getHeaderAttrs()) + (  # type: ignore[misc]
             ("X-Setup-Requires", "setup_requires", True),
             ("X-Tests-Require", "tests_require", True),
             ("???", "extras_require", False),

requirements-dev.txt

@@ -1,12 +1,12 @@
-black==22.1.0
-click==8.0.3
-coverage==4.5.4
-flake8==3.7.9
-mypy==0.931
-tox==3.24.5
-twine==3.1.1
-ufmt==1.3.1.post1
-usort==1.0.1
+black==24.10.0
+click==8.1.7
+coverage==7.6.8
+flake8==7.1.1
+mypy==1.13.0
+tox==4.23.2
+twine==5.1.1
+ufmt==2.8.0
+usort==1.0.8.post1
 volatile==2.1.0
-wheel==0.37.1
-honesty==0.3.0a2
+wheel==0.45.1
+honesty==0.3.0b1

requirements.txt

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

setup.cfg

@@ -16,7 +16,7 @@ packages =
 setup_requires =
     setuptools_scm
     setuptools >= 38.3.0
-python_requires = >=3.6
+python_requires = >=3.7
 install_requires =
     highlighter>=0.1.1
     imperfect>=0.1.0
@@ -48,7 +48,7 @@ use_parentheses = True
 
 [mypy]
 ignore_missing_imports = True
-python_version = 3.7
+python_version = 3.8
 strict = True
 
 [tox:tox]