Release: 1.5.1

[pinch] / pinch.py

diff --git a/pinch.py b/pinch.py
index 5f250150660351cc59da24bb1578790dbf1290b2..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(


@@ -482,6 +482,7 @@ def git_revision_name(v: Verification, channel: Channel) -> str:
                               '-n1',
                               '--format=%ct-%h',
                               '--abbrev=11',
                               '-n1',
                               '--format=%ct-%h',
                               '--abbrev=11',

+                              '--no-show-signature',

                               channel.git_revision],
                              stdout=subprocess.PIPE)
     v.result(process.returncode == 0 and process.stdout != b'')
                               channel.git_revision],
                              stdout=subprocess.PIPE)
     v.result(process.returncode == 0 and process.stdout != b'')