Support multiple versions of mypy

0.701 needs the type-ignore directives

0.761 needs --no-warn-unused-ignores so it doesn't freak out about the
type-ignore directives for 0.701.

diff --git a/pinch.py b/pinch.py
index 4c8a51fe45472d3e8c5fba412da7c9df6ae46286..47f4e34a261779d1a880a7693e8cc66b22f2f871 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -131,7 +131,7 @@ def fetch(v: Verification, channel: Channel) -> None:
     request = urllib.request.urlopen(channel.channel_url, timeout=10)
     channel.channel_html = request.read()
     channel.forwarded_url = request.geturl()
     request = urllib.request.urlopen(channel.channel_url, timeout=10)
     channel.channel_html = request.read()
     channel.forwarded_url = request.geturl()

-    v.result(request.status == 200)
+    v.result(request.status == 200)  # type: ignore  # (for old mypy)

     v.check('Got forwarded', channel.channel_url != channel.forwarded_url)
 
 
     v.check('Got forwarded', channel.channel_url != channel.forwarded_url)
 
 


@@ -212,7 +212,7 @@ def fetch_with_nix_prefetch_url(
     v.status("Verifying file digest")
     file_digest = digest_file(path)
     v.result(file_digest == digest)
     v.status("Verifying file digest")
     file_digest = digest_file(path)
     v.result(file_digest == digest)

-    return path
+    return path  # type: ignore  # (for old mypy)

 
 
 def fetch_resources(v: Verification, channel: Channel) -> None:
 
 
 def fetch_resources(v: Verification, channel: Channel) -> None:


@@ -423,7 +423,7 @@ def git_get_tarball(v: Verification, channel: Channel) -> str:
 
         os.makedirs(os.path.dirname(cache_file), exist_ok=True)
         open(cache_file, 'w').write(store_tarball)
 
         os.makedirs(os.path.dirname(cache_file), exist_ok=True)
         open(cache_file, 'w').write(store_tarball)

-        return store_tarball
+        return store_tarball  # type: ignore  # (for old mypy)

 
 
 def check_channel_metadata(
 
 
 def check_channel_metadata(

diff --git a/test.sh b/test.sh
index 16d9c053d0844b04010d6a6a2b5e8c757a0187a1..fed0065bd99b1d7a271b23787bfb2edcf371f455 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -5,7 +5,7 @@ set -e
 PARALLELISM=4
 
 find . -name build -prune -o -name dist -prune -o -name '*.py' -print0 |
 PARALLELISM=4
 
 find . -name build -prune -o -name dist -prune -o -name '*.py' -print0 |

-  xargs -0 mypy --strict --ignore-missing-imports
+  xargs -0 mypy --strict --ignore-missing-imports --no-warn-unused-ignores

 
 for test in tests/*;do
   if [ ! -d "$test" ];then
 
 for test in tests/*;do
   if [ ! -d "$test" ];then