[Python-apps-commits] r9670 - in packages/pyflakes/trunk/debian (12 files)
warsaw-guest at users.alioth.debian.org
warsaw-guest at users.alioth.debian.org
Fri May 24 19:23:33 UTC 2013
Date: Friday, May 24, 2013 @ 19:23:32
Author: warsaw-guest
Revision: 9670
* New upstream release.
+ debian/patches/add_main_function.diff as no longer appropriate since
args are taken from the return value of parser.parse_args()
* Add Python 3 support.
+ New binary package pyflakes3 which provides /usr/bin/pyflakes3 script.
Added:
packages/pyflakes/trunk/debian/pyflakes.manpages
(from rev 9668, packages/pyflakes/trunk/debian/manpages)
packages/pyflakes/trunk/debian/pyflakes3.1
packages/pyflakes/trunk/debian/pyflakes3.manpages
Modified:
packages/pyflakes/trunk/debian/changelog
packages/pyflakes/trunk/debian/control
packages/pyflakes/trunk/debian/patches/series
packages/pyflakes/trunk/debian/pyflakes.1
packages/pyflakes/trunk/debian/rules
Deleted:
packages/pyflakes/trunk/debian/manpages
packages/pyflakes/trunk/debian/patches/add_main_function.diff
packages/pyflakes/trunk/debian/patches/always_close_fd.diff
packages/pyflakes/trunk/debian/patches/check_encoding_errors.diff
Modified: packages/pyflakes/trunk/debian/changelog
===================================================================
--- packages/pyflakes/trunk/debian/changelog 2013-05-24 16:32:16 UTC (rev 9669)
+++ packages/pyflakes/trunk/debian/changelog 2013-05-24 19:23:32 UTC (rev 9670)
@@ -1,4 +1,4 @@
-pyflakes (0.6.1-1~exp2) UNRELEASED; urgency=low
+pyflakes (0.7.2-1) unstable; urgency=low
[ Sandro Tosi ]
* debian/control
@@ -7,8 +7,15 @@
[ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
- -- Jakub Wilk <jwilk at debian.org> Sun, 05 May 2013 18:05:32 +0200
+ [ Barry Warsaw ]
+ * New upstream release.
+ + debian/patches/add_main_function.diff as no longer appropriate since
+ args are taken from the return value of parser.parse_args()
+ * Add Python 3 support.
+ + New binary package pyflakes3 which provides /usr/bin/pyflakes3 script.
+ -- Barry Warsaw <barry at python.org> Fri, 24 May 2013 15:17:20 -0400
+
pyflakes (0.6.1-1~exp1) experimental; urgency=low
* New upstream release:
Modified: packages/pyflakes/trunk/debian/control
===================================================================
--- packages/pyflakes/trunk/debian/control 2013-05-24 16:32:16 UTC (rev 9669)
+++ packages/pyflakes/trunk/debian/control 2013-05-24 19:23:32 UTC (rev 9670)
@@ -2,9 +2,18 @@
Section: python
Priority: optional
Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Uploaders: Tristan Seligmann <mithrandi at mithrandi.net>, Varun Hiremath <varun at debian.org>
-Build-Depends: debhelper (>= 9), python
-XS-Python-Version: >= 2.6
+Uploaders: Tristan Seligmann <mithrandi at mithrandi.net>,
+ Varun Hiremath <varun at debian.org>
+Build-Depends: debhelper (>= 9),
+ python,
+ python-nose,
+ python-setuptools,
+ python-unittest2,
+ python3,
+ python3-nose,
+ python3-setuptools
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
Standards-Version: 3.9.4
Homepage: https://launchpad.net/pyflakes
Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/pyflakes/trunk/
@@ -12,11 +21,26 @@
Package: pyflakes
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
-Description: passive checker of Python programs
+Depends: python-pkg-resources, ${misc:Depends}, ${python:Depends}
+Description: passive checker of Python 2 programs
Pyflakes is program to analyze Python programs and detect various
errors. It works by parsing the source file, not importing it, so it
is safe to use on modules with side effects. It's also much faster.
.
Unlike PyLint, Pyflakes checks only for logical errors in programs;
it does not perform any checks on style.
+ .
+ This is the Python 2 version.
+
+Package: pyflakes3
+Architecture: all
+Depends: python3-pkg-resources, ${misc:Depends}, ${python3:Depends}
+Description: passive checker of Python 3 programs
+ Pyflakes is program to analyze Python programs and detect various
+ errors. It works by parsing the source file, not importing it, so it
+ is safe to use on modules with side effects. It's also much faster.
+ .
+ Unlike PyLint, Pyflakes checks only for logical errors in programs;
+ it does not perform any checks on style.
+ .
+ This is the Python 3 version.
Deleted: packages/pyflakes/trunk/debian/manpages
===================================================================
--- packages/pyflakes/trunk/debian/manpages 2013-05-24 16:32:16 UTC (rev 9669)
+++ packages/pyflakes/trunk/debian/manpages 2013-05-24 19:23:32 UTC (rev 9670)
@@ -1 +0,0 @@
-debian/pyflakes.1
Deleted: packages/pyflakes/trunk/debian/patches/add_main_function.diff
===================================================================
--- packages/pyflakes/trunk/debian/patches/add_main_function.diff 2013-05-24 16:32:16 UTC (rev 9669)
+++ packages/pyflakes/trunk/debian/patches/add_main_function.diff 2013-05-24 19:23:32 UTC (rev 9670)
@@ -1,22 +0,0 @@
-# fix arguments passing to main function
-
---- a/bin/pyflakes
-+++ b/bin/pyflakes
-@@ -1,3 +1,4 @@
- #!/usr/bin/env python
-+import sys
- from pyflakes.scripts.pyflakes import main
--main()
-+main(sys.argv[1:])
---- a/pyflakes/api.py
-+++ b/pyflakes/api.py
-@@ -120,8 +120,7 @@
- return warnings
-
-
--def main():
-- args = sys.argv[1:]
-+def main(args):
- reporter = modReporter._makeDefaultReporter()
- if args:
- warnings = checkRecursive(args, reporter)
Deleted: packages/pyflakes/trunk/debian/patches/always_close_fd.diff
===================================================================
--- packages/pyflakes/trunk/debian/patches/always_close_fd.diff 2013-05-24 16:32:16 UTC (rev 9669)
+++ packages/pyflakes/trunk/debian/patches/always_close_fd.diff 2013-05-24 19:23:32 UTC (rev 9670)
@@ -1,19 +0,0 @@
-# Be sure to close file descriptor (even in case of errors)
-
-Index: pyflakes-0.5.0/pyflakes/scripts/pyflakes.py
-===================================================================
---- pyflakes-0.5.0.orig/pyflakes/scripts/pyflakes.py 2011-09-11 19:38:35.005013432 +0200
-+++ pyflakes-0.5.0/pyflakes/scripts/pyflakes.py 2011-09-11 19:38:35.029011813 +0200
-@@ -66,7 +66,11 @@
- @return: the number of warnings printed
- """
- try:
-- return check(file(filename, 'U').read() + '\n', filename)
-+ fd = file(filename, 'U')
-+ try:
-+ return check(fd.read(), filename)
-+ finally:
-+ fd.close()
- except IOError, msg:
- print >> sys.stderr, "%s: %s" % (filename, msg.args[1])
- return 1
Deleted: packages/pyflakes/trunk/debian/patches/check_encoding_errors.diff
===================================================================
--- packages/pyflakes/trunk/debian/patches/check_encoding_errors.diff 2013-05-24 16:32:16 UTC (rev 9669)
+++ packages/pyflakes/trunk/debian/patches/check_encoding_errors.diff 2013-05-24 19:23:32 UTC (rev 9670)
@@ -1,16 +0,0 @@
-# Handle Unicode errors gracefully
-
-Index: pyflakes-0.5.0/pyflakes/scripts/pyflakes.py
-===================================================================
---- pyflakes-0.5.0.orig/pyflakes/scripts/pyflakes.py 2011-09-11 19:38:58.151449543 +0200
-+++ pyflakes-0.5.0/pyflakes/scripts/pyflakes.py 2011-09-11 19:38:58.163448731 +0200
-@@ -50,6 +50,9 @@
- print >> sys.stderr, " " * offset, "^"
-
- return 1
-+ except UnicodeError, msg:
-+ print >> sys.stderr, 'encoding error at %r: %s' % (filename, msg)
-+ return 1
- else:
- # Okay, it's syntactically valid. Now check it.
- w = checker.Checker(tree, filename)
Modified: packages/pyflakes/trunk/debian/patches/series
===================================================================
--- packages/pyflakes/trunk/debian/patches/series 2013-05-24 16:32:16 UTC (rev 9669)
+++ packages/pyflakes/trunk/debian/patches/series 2013-05-24 19:23:32 UTC (rev 9670)
@@ -1 +0,0 @@
-add_main_function.diff
Modified: packages/pyflakes/trunk/debian/pyflakes.1
===================================================================
--- packages/pyflakes/trunk/debian/pyflakes.1 2013-05-24 16:32:16 UTC (rev 9669)
+++ packages/pyflakes/trunk/debian/pyflakes.1 2013-05-24 19:23:32 UTC (rev 9670)
@@ -4,7 +4,7 @@
.\" disable justification (adjust text to left margin only)
.ad l
.SH "NAME"
-pyflakes - simple Python source checker
+pyflakes - simple Python 2 source checker
.SH "SYNOPSIS"
.PP
\fBpyflakes\fR [\fIfile-or-directory\fR ...]
Copied: packages/pyflakes/trunk/debian/pyflakes.manpages (from rev 9668, packages/pyflakes/trunk/debian/manpages)
===================================================================
--- packages/pyflakes/trunk/debian/pyflakes.manpages (rev 0)
+++ packages/pyflakes/trunk/debian/pyflakes.manpages 2013-05-24 19:23:32 UTC (rev 9670)
@@ -0,0 +1 @@
+debian/pyflakes.1
Added: packages/pyflakes/trunk/debian/pyflakes3.1
===================================================================
--- packages/pyflakes/trunk/debian/pyflakes3.1 (rev 0)
+++ packages/pyflakes/trunk/debian/pyflakes3.1 2013-05-24 19:23:32 UTC (rev 9670)
@@ -0,0 +1,33 @@
+.TH "PYFLAKES3" "1" "10/01/2007" "" ""
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+pyflakes3 - simple Python 3 source checker
+.SH "SYNOPSIS"
+.PP
+\fBpyflakes3\fR [\fIfile-or-directory\fR ...]
+.SH "DESCRIPTION"
+Pyflakes is a simple program which checks Python source files for errors.
+It is similar to PyChecker in scope, but differs in that it does not
+execute the modules to check them. This is both safer and faster, although
+it does not perform as many checks. Unlike PyLint, Pyflakes checks only
+for logical errors in programs; it does not perform any checks on style.
+.sp
+All commandline arguments are checked, which have to be either regular files
+or directories. If a directory is given, every \fB.py\fR file within
+will be checked.
+.sp
+When no commandline arguments are given, data will be read from standard input.
+.SH "OUTPUT"
+Found warnings including unused imports, undefined variables
+and unnecessary reimports, are printed on standard output.
+Found errors including compile or encoding errors, are printed
+on standard error.
+.SH "EXIT STATUS"
+The exit status is 0 when no warnings or errors are found. Otherwise the exit
+status is 1.
+.SH "AUTHOR"
+This manual page was originally written by Bastian Kleineidam <calvin at debian\.org>
+for the Debian distribution of pyflakes (but can be used by others)\.
Added: packages/pyflakes/trunk/debian/pyflakes3.manpages
===================================================================
--- packages/pyflakes/trunk/debian/pyflakes3.manpages (rev 0)
+++ packages/pyflakes/trunk/debian/pyflakes3.manpages 2013-05-24 19:23:32 UTC (rev 9670)
@@ -0,0 +1 @@
+debian/pyflakes3.1
Modified: packages/pyflakes/trunk/debian/rules
===================================================================
--- packages/pyflakes/trunk/debian/rules 2013-05-24 16:32:16 UTC (rev 9669)
+++ packages/pyflakes/trunk/debian/rules 2013-05-24 19:23:32 UTC (rev 9670)
@@ -1,7 +1,58 @@
#!/usr/bin/make -f
+DH_VERBOSE=1
+
+PYTHON2=$(shell pyversions -vd)
+PYTHON3=$(shell py3versions -vd)
+
+# Prevent setuptools/distribute from accessing the internet.
+export http_proxy = http://127.0.9.1:9
+
%:
- dh $@ --with=python2
+ dh $@ --with python2,python3
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+test-python%:
+ python$* setup.py test -vv
+
+# The pyflakes unittests only run under Python 2 due to dependencies on
+# unittest2, which is a Python 2-only package. LP: #1183953.
+override_dh_auto_test: $(PYTHON2:%=test-python%)
+endif
+
+build-python%:
+ python$* setup.py build
+
+override_dh_auto_build: $(PYTHON3:%=build-python%)
+ dh_auto_build
+
+override_dh_auto_install:
+ set -ex; \
+ for v in $(PYTHON2); do \
+ rm -rf pyflakes.egg-info; \
+ python$$v setup.py install \
+ --skip-build \
+ --root=debian/pyflakes \
+ --install-layout=deb; \
+ done
+ sed -i -e 's,#!/usr/bin/python.*,#!/usr/bin/python,' \
+ debian/pyflakes/usr/bin/pyflakes
+ set -ex; \
+ for v in $(PYTHON3); do \
+ rm -rf pyflakes.egg-info; \
+ python$$v setup.py install \
+ --skip-build \
+ --root=debian/pyflakes3 \
+ --install-layout=deb; \
+ done
+ sed -i -e 's,#!/usr/bin/python3.*,#!/usr/bin/python3,' \
+ debian/pyflakes3/usr/bin/pyflakes
+ cd debian/pyflakes3/usr/bin && mv pyflakes pyflakes3
+
override_dh_installchangelogs:
dh_installchangelogs NEWS.txt
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf build
+ rm -rf *.egg-info
More information about the Python-apps-commits
mailing list