[lintian] 01/01: Remove two PyPI checks, no longer actual with uscan 2.15.5
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 70b36e1464470585a9a2bddff9d5d160715cb032
Author: Dmitry Shachnev <mitya57@gmail.com>
Date: Tue Jul 21 21:53:25 2015 +0300
Remove two PyPI checks, no longer actual with uscan 2.15.5
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/watch-file.desc | 22 ----------------------
checks/watch-file.pm | 7 -------
debian/changelog | 2 ++
t/tests/watch-file-general/debian/debian/watch | 6 ------
t/tests/watch-file-general/desc | 2 --
t/tests/watch-file-general/tags | 7 ++-----
6 files changed, 4 insertions(+), 42 deletions(-)
diff --git a/checks/watch-file.desc b/checks/watch-file.desc
index 792c85a..8a7fd93 100644
--- a/checks/watch-file.desc
+++ b/checks/watch-file.desc
@@ -186,25 +186,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 05eab9c..ebd20d4 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%githubredir\.debian\.net%) {
tag 'debian-watch-file-uses-deprecated-githubredir',"line $.";
}
@@ -138,10 +135,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/debian/changelog b/debian/changelog
index 7e34865..8a225df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ lintian (2.5.40) UNRELEASED; urgency=medium
+ [BR] Apply patch from Chris Lamb <lamby@debian.org>,
warn if debian/watch uses deprecated
githubredir.debian.net scraper (Closes: #803106).
+ + [NT] Apply patch from Dmitry Shachnev <mitya57@debian.org> to
+ remove obsolete check. (Closes: #793149)
* data/spelling/corrections*:
+ [JW] Add more corrections.
diff --git a/t/tests/watch-file-general/debian/debian/watch b/t/tests/watch-file-general/debian/debian/watch
index e322710..a96531e 100644
--- a/t/tests/watch-file-general/debian/debian/watch
+++ b/t/tests/watch-file-general/debian/debian/watch
@@ -20,12 +20,6 @@ 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
-
# Deprecated githubredir
http://githubredir.debian.net/github/username/project /(.*).tar.gz
diff --git a/t/tests/watch-file-general/desc b/t/tests/watch-file-general/desc
index 0e7a20e..4a31273 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-file-uses-deprecated-githubredir
debian-watch-may-check-gpg-signature
diff --git a/t/tests/watch-file-general/tags b/t/tests/watch-file-general/tags
index 1c54f22..675508a 100644
--- a/t/tests/watch-file-general/tags
+++ b/t/tests/watch-file-general/tags
@@ -1,6 +1,4 @@
-E: watch-file-general source: debian-watch-file-unsupported-pypi-url line 27
-E: watch-file-general source: debian-watch-file-uses-deprecated-githubredir line 30
-I: watch-file-general source: debian-watch-file-accesses-pypi-over-http line 24
+E: watch-file-general source: debian-watch-file-uses-deprecated-githubredir 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
@@ -8,8 +6,7 @@ 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-mangle-version line 30
+W: watch-file-general source: debian-watch-file-should-mangle-version line 24
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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: