Merge lp:~barry/ubuntu/oneiric/python-support/merge1.0.13 into lp:ubuntu/oneiric/python-support

[Barry Warsaw]

===========
Merge notes
===========

Debian version: 1.0.13
Ubuntu version: 1.0.10ubuntu3

Differences
===========

debhelper/dh_pysupport
----------------------

* Debian version now looks for supported versions in
  /usr/share/python/debian_defaults instead of hardcoding them.
  status: adopt debian change

* Ubuntu add a --prefix option
  * documentation needs grammatical fixes
  * do we have documented use cases?
  * why has change not been pushed to debian?
  * how to test this?
  status: keep Ubuntu changes, but clean up documentation.

[Didier Roche-Tolomelli (didrocks)]

The change looks good to me!

As per the --prefix:
- this is a short time solution. As you probably now, I was focused on other things last cycle (unity? :p) but still had an action for the "update stable applications in extras.ubuntu.com". The outcome of the discussion (where I wasn't involved in) was the applications in extras.ubuntu.com would install in /opt/extras.ubuntu.com/<application-name>-version/

So, we needed some way to install and link python modules from there, hence the --prefix solution (just had an evening to link and to make those things work out). This is call by the "submitubuntu" command in Quickly, which call a special argument in python-distutils-extra which generates some CDBS rules which call this option. So yeah, this solution is spread across 4 packages.

I didn't have the time to get a deeper look (and still think it's the right solution). That's why it wasn't pushed to debian. Anymore, if we want to push that to debian, we have to support all python build systems (dh_python* in particular).

If you want to test it:
install quickly
quickly create ubuntu-application foo
quickly submitubuntu

I still think that's not the rigth solution and we need a better story at the packaging level itself for installing out of prefix, support menu browsing (like dbus services, desktop files…) and not rely on the current symlink solution.

The thing is that I'm not sure anyone is assigned to get that story better this cycle.

Hope that makes things clear :)

review: Approve

[Barry Warsaw (barry)]

It does very much, thanks! I'll clean up the help string in dh_pysupport, and elaborate on the reason for the Ubuntu-specific change in the changelog file. That will do for now (especially since we want to eradicate pysupport anyway :).

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-11 14:02:13 +0000
+++ debian/changelog	2011-05-26 18:37:31 +0000
@@ -1,3 +1,41 @@
+python-support (1.0.13ubuntu1) oneiric; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - movemodules, update-python-modules, debhelper/dh_pysupport:
+      add support for --prefix
+
+ -- Barry Warsaw <[e-mail]>  Thu, 26 May 2011 14:24:43 -0400
+
+python-support (1.0.13) unstable; urgency=low
+
+  [ Loïc Minier ]
+  * tests/testparseversions.py: don't hardcode expected versions; instead,
+    compare with pyversions' output.
+  * pysupport.py: don't hardcode supported and old versions; instead, parse
+    debian_defaults; NB: this removes some very old python versions from the
+    list (2.1 and 2.2), but these weren't ever support and aren't supported in
+    the previous stable release anyway.  Depend on python-minimal as
+    debian_defaults is accessed directly.
+
+  [ Piotr Ożarowski ]
+  * Upload to unstable (closes: #622906)
+  * Add lintian override for depends-on-python-minimal
+
+ -- Piotr Ożarowski <[e-mail]>  Fri, 15 Apr 2011 21:14:04 +0200
+
+python-support (1.0.12) experimental; urgency=low
+
+  * Add support for python2.7.
+  * Move python2.4 to old versions.
+
+ -- Piotr Ożarowski <[e-mail]>  Mon, 18 Oct 2010 19:51:21 +0200
+
+python-support (1.0.11) unstable; urgency=low
+
+  * Move python2.4 to old versions.
+
+ -- Piotr Ożarowski <[e-mail]>  Tue, 19 Oct 2010 17:20:22 +0200
+
 python-support (1.0.10ubuntu3) natty; urgency=low
 
   * movemodules, update-python-modules, debhelper/dh_pysupport:

=== modified file 'debian/control'
--- debian/control	2010-10-13 17:10:04 +0000
+++ debian/control	2011-05-26 18:37:31 +0000
@@ -12,7 +12,7 @@
 
 Package: python-support
 Architecture: all
-Depends: python (>= 2.5), dpkg (>= 1.14.19), ${misc:Depends}
+Depends: python (>= 2.5), python-minimal, dpkg (>= 1.14.19), ${misc:Depends}
 Conflicts: debhelper (<< 5.0.38)
 Description: automated rebuilding support for Python modules
  This package contains the 'update-python-modules' script, which takes 

=== added file 'debian/python-support.lintian-overrides'
--- debian/python-support.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/python-support.lintian-overrides	2011-05-26 18:37:31 +0000
@@ -0,0 +1,1 @@
+python-support: depends-on-python-minimal depends

=== modified file 'movemodules'
--- movemodules	2010-11-11 14:02:13 +0000
+++ movemodules	2011-05-26 18:37:31 +0000
@@ -221,7 +221,7 @@
   files.update(files2)
   pyversions.update(pyversions2)
 
-# <prefix>/share/python-support/$package
+  # <prefix>/share/python-support/$package
   if os.path.isdir(os.path.join(basedir, "%s/share/python-support" % prefix)):
     for ent in os.listdir(os.path.join(basedir, "%s/share/python-support" % prefix)):
       if os.path.isdir(os.path.join(basedir, "%s/share/python-support" % prefix, ent)):

=== modified file 'pysupport.py'
--- pysupport.py	2010-10-20 14:15:18 +0000
+++ pysupport.py	2011-05-26 18:37:31 +0000
@@ -1,10 +1,15 @@
 import os
-
-# Do not get the version list from pyversions, it isn't reliable
-py_supported = ['python2.6', 'python2.7']
+from ConfigParser import SafeConfigParser
+
+config = SafeConfigParser()
+config.readfp(file('/usr/share/python/debian_defaults'))
+versions = config.get('DEFAULT', 'supported-versions')
+py_supported = [s.strip() for s in versions.split(',')]
+versions = config.get('DEFAULT', 'old-versions')
+py_oldversions = [s.strip() for s in versions.split(',')]
+
 py_installed = [ ver for ver in py_supported if os.access('/usr/bin/'+ver,os.X_OK) ]
 py_supported_short = [ a.replace("python","") for a in py_supported ]
-py_oldversions = ['python2.1','python2.2','python2.3', 'python2.4', 'python2.5']
 
 def version_cmp(ver1,ver2):
   v1=[int(i) for i in ver1.split('.')]

=== modified file 'tests/testparseversions.py'
--- tests/testparseversions.py	2010-10-20 14:15:18 +0000
+++ tests/testparseversions.py	2011-05-26 18:37:31 +0000
@@ -4,28 +4,33 @@
 import subprocess
 
 class TestParseVersions(unittest.TestCase):
-    def get_output(self, control):
-        subp = subprocess.Popen(["parseversions", "--pycentral", control],
-                                stdout=subprocess.PIPE)
+    @staticmethod
+    def get_output(args):
+        subp = subprocess.Popen(args, stdout=subprocess.PIPE)
         output = subp.communicate()[0]
         if subp.returncode != 0:
             raise RuntimeError, subp.returncode
         return output
 
+    def pv_output(self, control):
+        return TestParseVersions.get_output(["parseversions", "--pycentral", control])
+
     def test_regular(self):
-        self.assertEqual(self.get_output('testparseversions.regular.control'), '2.6 2.7\n')
+        self.assertEqual(self.pv_output('testparseversions.regular.control'),
+                         TestParseVersions.get_output(['pyversions', '--supported', '-v']))
 
     def test_leading_newline(self):
-        self.assertEqual(self.get_output('testparseversions.leading-newline.control'), '2.6 2.7\n')
+        self.assertEqual(self.pv_output('testparseversions.leading-newline.control'),
+                         TestParseVersions.get_output(['pyversions', '--supported', '-v']))
 
     def test_missing(self):
-        self.assertRaises(RuntimeError, self.get_output, 'testparseversions.missing.control')
+        self.assertRaises(RuntimeError, self.pv_output, 'testparseversions.missing.control')
 
     def test_second_paragraph(self):
-        self.assertRaises(RuntimeError, self.get_output, 'testparseversions.second-paragraph.control')
+        self.assertRaises(RuntimeError, self.pv_output, 'testparseversions.second-paragraph.control')
 
     def test_spaces(self):
-        self.assertRaises(RuntimeError, self.get_output, 'testparseversions.spaces.control')
+        self.assertRaises(RuntimeError, self.pv_output, 'testparseversions.spaces.control')
 
 if __name__ == '__main__':
     unittest.main()