launchpad-reviewers team mailing list archive

[Colin Watson <mp+428088@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:mypy-archivepublisher-archiveuploader into launchpad:master.

Commit message:
mypy: Run for lp.{archivepublisher,archiveuploader}

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/428088

`lp.archivepublisher` just needed one small tweak due to a known `mypy` bug (fixed in later versions).
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:mypy-archivepublisher-archiveuploader into launchpad:master.

diff --git a/lib/lp/archivepublisher/diskpool.py b/lib/lp/archivepublisher/diskpool.py
index 61803e9..17cbd99 100644
--- a/lib/lp/archivepublisher/diskpool.py
+++ b/lib/lp/archivepublisher/diskpool.py
@@ -189,7 +189,8 @@ class DiskPoolEntry:
             if component in components:
                 return component
 
-        return
+        # https://github.com/python/mypy/issues/7511
+        return None
 
     @cachedproperty
     def file_hash(self) -> str:
diff --git a/tox.ini b/tox.ini
index de5aa53..cb3eb0f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,4 +27,4 @@ deps =
     -r requirements/types.txt
 commands =
     mypy --follow-imports=silent \
-    {posargs:lib/lp/answers lib/lp/app}
+    {posargs:lib/lp/answers lib/lp/app lib/lp/archivepublisher lib/lp/archiveuploader}