[Python-apps-commits] r9456 - in packages/pyflakes/trunk/debian (7 files)

xnox at users.alioth.debian.org xnox at users.alioth.debian.org
Mon Feb 25 18:20:55 UTC 2013 

    Date: Monday, February 25, 2013 @ 18:20:53
  Author: xnox
Revision: 9456

Add python3 package / module.

Added:
  packages/pyflakes/trunk/debian/patches/use-standard-unittest.patch
  packages/pyflakes/trunk/debian/pyflakes.manpages
    (from rev 9455, packages/pyflakes/trunk/debian/manpages)
Modified:
  packages/pyflakes/trunk/debian/changelog
  packages/pyflakes/trunk/debian/control
  packages/pyflakes/trunk/debian/patches/series
  packages/pyflakes/trunk/debian/rules
Deleted:
  packages/pyflakes/trunk/debian/manpages

Modified: packages/pyflakes/trunk/debian/changelog
===================================================================
--- packages/pyflakes/trunk/debian/changelog	2013-02-25 14:11:44 UTC (rev 9455)
+++ packages/pyflakes/trunk/debian/changelog	2013-02-25 18:20:53 UTC (rev 9456)
@@ -1,3 +1,9 @@
+pyflakes (0.6.1-1~exp1ubuntu1) UNRELEASED; urgency=low
+
+  * Add python3 package / module.
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>  Mon, 25 Feb 2013 18:15:57 +0000
+
 pyflakes (0.6.1-1~exp1) experimental; urgency=low
 
   * New upstream release:

Modified: packages/pyflakes/trunk/debian/control
===================================================================
--- packages/pyflakes/trunk/debian/control	2013-02-25 14:11:44 UTC (rev 9455)
+++ packages/pyflakes/trunk/debian/control	2013-02-25 18:20:53 UTC (rev 9456)
@@ -3,8 +3,10 @@
 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>, Sandro Tosi <morph at debian.org>
-Build-Depends: debhelper (>= 9), python
+#Needs python3.3 to run unittests, but can be executed / used with lower py3.x
+Build-Depends: debhelper (>= 9), python, python3, python3 (>= 3.3) | python3.3
 XS-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/
@@ -20,3 +22,14 @@
  .
  Unlike PyLint, Pyflakes checks only for logical errors in programs;
  it does not perform any checks on style.
+
+Package: py3flakes
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}
+Description: passive checker of Python 3 programs
+ Pyflakes is program to analyze Python 3 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.

Deleted: packages/pyflakes/trunk/debian/manpages
===================================================================
--- packages/pyflakes/trunk/debian/manpages	2013-02-25 14:11:44 UTC (rev 9455)
+++ packages/pyflakes/trunk/debian/manpages	2013-02-25 18:20:53 UTC (rev 9456)
@@ -1 +0,0 @@
-debian/pyflakes.1

Modified: packages/pyflakes/trunk/debian/patches/series
===================================================================
--- packages/pyflakes/trunk/debian/patches/series	2013-02-25 14:11:44 UTC (rev 9455)
+++ packages/pyflakes/trunk/debian/patches/series	2013-02-25 18:20:53 UTC (rev 9456)
@@ -1 +1,2 @@
 add_main_function.diff
+use-standard-unittest.patch

Added: packages/pyflakes/trunk/debian/patches/use-standard-unittest.patch
===================================================================
--- packages/pyflakes/trunk/debian/patches/use-standard-unittest.patch	                        (rev 0)
+++ packages/pyflakes/trunk/debian/patches/use-standard-unittest.patch	2013-02-25 18:20:53 UTC (rev 9456)
@@ -0,0 +1,86 @@
+Description: do not use unittest2py3
+Author: Dmitrijs Ledkovs <xnox at debian.org>
+
+--- pyflakes-0.6.1.orig/setup.py
++++ pyflakes-0.6.1/setup.py
+@@ -13,8 +13,8 @@ else:
+         extra = {'tests_require': ['unittest2'],
+                  'test_suite': 'unittest2.collector'}
+     else:
+-        extra = {'tests_require': ['unittest2py3k'],
+-                 'test_suite': 'unittest2.collector.collector'}
++        extra = {'test_suite': 'pyflakes.test'}
++
+     extra['entry_points'] = {
+         'console_scripts': ['pyflakes = pyflakes.api:main'],
+     }
+--- pyflakes-0.6.1.orig/pyflakes/test/test_api.py
++++ pyflakes-0.6.1/pyflakes/test/test_api.py
+@@ -12,7 +12,10 @@ try:
+ except ImportError:
+     from StringIO import StringIO
+ 
+-from unittest2 import skipIf, TestCase
++try:
++    from unittest import skipIf, TestCase
++except ImportError:
++    from unittest2 import skipIf, TestCase
+ 
+ from pyflakes.messages import UnusedImport
+ from pyflakes.reporter import Reporter
+--- pyflakes-0.6.1.orig/pyflakes/test/test_imports.py
++++ pyflakes-0.6.1/pyflakes/test/test_imports.py
+@@ -1,6 +1,10 @@
+ 
+ from sys import version_info
+-from unittest2 import skip, skipIf
++
++try:
++    from unittest import skip, skipIf
++except ImportError:
++    from unittest2 import skip, skipIf
+ 
+ from pyflakes import messages as m
+ from pyflakes.test import harness
+--- pyflakes-0.6.1.orig/pyflakes/test/harness.py
++++ pyflakes-0.6.1/pyflakes/test/harness.py
+@@ -2,7 +2,10 @@
+ import textwrap
+ import _ast
+ 
+-import unittest2
++try:
++    import unittest2
++except:
++    import unittest as unittest2
+ 
+ from pyflakes import checker
+ 
+--- pyflakes-0.6.1.orig/pyflakes/test/test_undefined_names.py
++++ pyflakes-0.6.1/pyflakes/test/test_undefined_names.py
+@@ -2,7 +2,10 @@
+ from _ast import PyCF_ONLY_AST
+ from sys import version_info
+ 
+-from unittest2 import skip, skipIf, TestCase
++try:
++    from unittest import skip, skipIf, TestCase
++except ImportError:
++    from unittest2 import skip, skipIf, TestCase
+ 
+ from pyflakes import messages as m, checker
+ from pyflakes.test import harness
+--- pyflakes-0.6.1.orig/pyflakes/test/test_other.py
++++ pyflakes-0.6.1/pyflakes/test/test_other.py
+@@ -6,7 +6,10 @@ Tests for various Pyflakes behavior.
+ """
+ 
+ from sys import version_info
+-from unittest2 import skip, skipIf
++try:
++    from unittest import skip, skipIf
++except ImportError:
++    from unittest2 import skip, skipIf
+ 
+ from pyflakes import messages as m
+ from pyflakes.test import harness

Copied: packages/pyflakes/trunk/debian/pyflakes.manpages (from rev 9455, packages/pyflakes/trunk/debian/manpages)
===================================================================
--- packages/pyflakes/trunk/debian/pyflakes.manpages	                        (rev 0)
+++ packages/pyflakes/trunk/debian/pyflakes.manpages	2013-02-25 18:20:53 UTC (rev 9456)
@@ -0,0 +1 @@
+debian/pyflakes.1

Modified: packages/pyflakes/trunk/debian/rules
===================================================================
--- packages/pyflakes/trunk/debian/rules	2013-02-25 14:11:44 UTC (rev 9455)
+++ packages/pyflakes/trunk/debian/rules	2013-02-25 18:20:53 UTC (rev 9456)
@@ -1,7 +1,21 @@
 #!/usr/bin/make -f
 
+export PYBUILD_DESTDIR_python2=debian/pyflakes
+export PYBUILD_DESTDIR_python3=debian/py3flakes
+# todo fix test-suite fail http://pad.lv/1132910
+export PYBUILD_DISABLE_python3.3=test
+
 %:
-	dh $@ --with=python2
+	dh $@ --with=python2,python3 --buildsystem=pybuild
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS.txt
+
+override_dh_python2:
+	dh_python2 -ppyflakes
+
+override_dh_python3:
+	dh_python3 --shebang=/usr/bin/python3 -ppy3flakes
+	# todo decide on the name for py3 binary http://pad.lv/1132892
+	# no conflicting binaries for now
+	rm -rf debian/py3flakes/usr/bin/

More information about the Python-apps-commits mailing list