Package: lintian Version: 2.5.33 Dear Lintian maintainers, Since devscripts commit 771c1e4f336d7606 [1] (part of 2.5.15 release), uscan redirects pypi.python.org (both http and https) to pypi.debian.net. So these checks are no longer actual and can be removed: * debian-watch-file-accesses-pypi-over-http * debian-watch-file-unsupported-pypi-url A patch to remove them is attached. [1]: https://anonscm.debian.org/cgit/collab-maint/devscripts.git/commit/?id=771c1e4f336d7606 -- Dmitry Shachnev
From 40b79cc2573704bf8d3b5736474472669225970c Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev <mitya57@gmail.com> Date: Tue, 21 Jul 2015 21:53:25 +0300 Subject: [PATCH] Remove two PyPI checks, no longer actual with uscan 2.15.5 --- checks/watch-file.desc | 22 ---------------------- checks/watch-file.pm | 7 ------- t/tests/watch-file-general/debian/debian/watch | 8 +------- t/tests/watch-file-general/desc | 2 -- t/tests/watch-file-general/tags | 3 --- 5 files changed, 1 insertion(+), 41 deletions(-) diff --git a/checks/watch-file.desc b/checks/watch-file.desc index 10e2875..d66aaee 100644 --- a/checks/watch-file.desc +++ b/checks/watch-file.desc @@ -173,25 +173,3 @@ Severity: wishlist Certainty: certain Info: The watch file contains a standard template included by dh_make. Please remove them once you have implemented the watch file. - -# Imported from lintian4python (python/watch) -Tag: debian-watch-file-accesses-pypi-over-http -Severity: wishlist -Certainty: certain -Info: The watch file is pointing at PyPI, using an http URL, not https. - PyPI now has https enabled, so you should be able to simply switch to - https. - -Tag: debian-watch-file-unsupported-pypi-url -Severity: important -Certainty: certain -Ref: #776267, https://wiki.python.org/moin/PyPISimple -Info: The watch file specifies a PyPI URL, which is not a supported API. - Instead, use either the pypi.debian.net redirector service or PyPI's - Simple API: - . - http://pypi.debian.net/<distribution-name>/<distribution-name>-(.*).tar.gz - https://pypi.python.org/simple/<distribution-name>/ … - . - replacing <tt><distribution-name></tt> with the canonical name - of the Python project. diff --git a/checks/watch-file.pm b/checks/watch-file.pm index 46ab633..cd0f8de 100644 --- a/checks/watch-file.pm +++ b/checks/watch-file.pm @@ -119,9 +119,6 @@ sub run { tag 'debian-watch-file-uses-deprecated-sf-redirector-method', "line $."; } - if (m,\b\Qhttp://pypi.python.org/\E,) { - tag 'debian-watch-file-accesses-pypi-over-http', "line $."; - } if ( m{ (?:https?|ftp):// @@ -135,10 +132,6 @@ sub run { tag 'debian-watch-file-should-use-sf-redirector', "line $."; } - if (m%https?://pypi\.python\.org/packages/source/%) { - tag 'debian-watch-file-unsupported-pypi-url', "line $."; - } - # This bit is as-is from uscan.pl: my ($base, $filepattern, $lastversion, $action) = split ' ', $_, 4; # Per #765995, $base might be undefined. diff --git a/t/tests/watch-file-general/debian/debian/watch b/t/tests/watch-file-general/debian/debian/watch index 71b4717..654e3fd 100644 --- a/t/tests/watch-file-general/debian/debian/watch +++ b/t/tests/watch-file-general/debian/debian/watch @@ -20,10 +20,4 @@ version=42 # Specifies the same version number as the package. http://example.com/ foo([\d.]+)\.tar\.gz 2.0.ds1-1 uupdate -opts="dversionmangle=s/ds-.*$//" \ -http://pypi.python.org/foo scripts\.([\d.]+)\.tar\.gz debian uupdate - -# Unsupported PyPI URL. -https://pypi.python.org/packages/source/p/pip/ pip-(\S+)\.tar\.gz - -# without any pgpsigurlmangle \ No newline at end of file +# without any pgpsigurlmangle diff --git a/t/tests/watch-file-general/desc b/t/tests/watch-file-general/desc index 64d09c9..aefc585 100644 --- a/t/tests/watch-file-general/desc +++ b/t/tests/watch-file-general/desc @@ -6,14 +6,12 @@ Description: General watch file checks Options: -I -E --pedantic Skeleton: pedantic Test-For: - debian-watch-file-accesses-pypi-over-http debian-watch-file-declares-multiple-versions debian-watch-file-should-dversionmangle-not-uversionmangle debian-watch-file-should-mangle-version debian-watch-file-should-use-sf-redirector debian-watch-file-specifies-wrong-upstream-version debian-watch-file-unknown-version - debian-watch-file-unsupported-pypi-url debian-watch-file-uses-deprecated-sf-redirector-method debian-watch-may-check-gpg-signature References: Debian Bug#510398 diff --git a/t/tests/watch-file-general/tags b/t/tests/watch-file-general/tags index a80f45b..de38a58 100644 --- a/t/tests/watch-file-general/tags +++ b/t/tests/watch-file-general/tags @@ -1,5 +1,3 @@ -E: watch-file-general source: debian-watch-file-unsupported-pypi-url line 27 -I: watch-file-general source: debian-watch-file-accesses-pypi-over-http line 24 I: watch-file-general source: debian-watch-file-should-dversionmangle-not-uversionmangle line 5 P: watch-file-general source: debian-watch-may-check-gpg-signature W: watch-file-general source: debian-watch-file-declares-multiple-versions line 18 @@ -7,7 +5,6 @@ W: watch-file-general source: debian-watch-file-declares-multiple-versions line W: watch-file-general source: debian-watch-file-should-mangle-version line 12 W: watch-file-general source: debian-watch-file-should-mangle-version line 14 W: watch-file-general source: debian-watch-file-should-mangle-version line 15 -W: watch-file-general source: debian-watch-file-should-mangle-version line 27 W: watch-file-general source: debian-watch-file-should-use-sf-redirector line 12 W: watch-file-general source: debian-watch-file-should-use-sf-redirector line 14 W: watch-file-general source: debian-watch-file-should-use-sf-redirector line 15 -- 2.1.4
Attachment:
signature.asc
Description: OpenPGP digital signature