Merge lp:~mvo/software-center/use-pydebian-in-setup into lp:software-center

[Michael Vogt]

Use python-debian to gather information from the changelog instead of regex.
Remove no longer used PocketLint.

This branch moves from using regexp for extracting the version number from the debian/changelog to python-debian to make it more robust. It also removes (as a drive-by cleanup) the Pocketlint command which we don't use anymore since we added the pyflakes test.

[dobey (dobey)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2012-12-11 10:58:08 +0000
+++ debian/control	2012-12-19 10:07:29 +0000
@@ -9,6 +9,7 @@
                intltool,
                po4a,
                python,
+               python-debian,
                python-aptdaemon,
                python-dbus,
                python-distutils-extra,

=== modified file 'setup.py'
--- setup.py	2012-12-17 17:29:24 +0000
+++ setup.py	2012-12-19 10:07:29 +0000
@@ -12,34 +12,7 @@
 from distutils.core import setup
 from DistUtilsExtra.command import (build_extra, build_i18n, build_help,
                                     build_icons)
-
-
-class PocketLint(distutils.cmd.Command):
-    """ command class that runs pocketlint """
-    user_options = []
-
-    def initialize_options(self):
-        pass
-
-    def finalize_options(self):
-        pass
-
-    def binary_in_path(self, binary):
-        return any([os.path.exists(os.path.join(p, binary))
-                    for p in os.environ["PATH"].split(":")])
-
-    def run(self):
-        if not self.binary_in_path("pocketlint"):
-            sys.stderr.write("No pocketlint found in path\n"
-                             "Use python-pocket-lint in natty or from "
-                             "ppa:sinzui\n")
-            return
-        py_files = []
-        for root, dirs, files in os.walk("."):
-            pyl = fnmatch.filter(files, "*.py")
-            py_files.extend([os.path.join(root, f) for f in pyl
-                             if os.path.exists(os.path.join(root, f))])
-        call(["pocketlint"] + py_files)
+from debian.changelog import Changelog
 
 
 def merge_authors_into_about_dialog():
@@ -62,13 +35,15 @@
 
 
 # update version.py
-line = open("debian/changelog").readline()
-m = re.match("^[\w-]+ \(([\w\.~]+)\) ([\w-]+);", line)
-VERSION = m.group(1)
-CODENAME = m.group(2)
-DISTRO = platform.dist()[0]
-RELEASE = platform.dist()[1]
-open("softwarecenter/version.py", "w").write("""
+def update_version():
+    changelog = Changelog(open("debian/changelog"), max_blocks=1)
+    # use or upstream_version instead?
+    VERSION = changelog.full_version
+    CODENAME = changelog.distributions
+    # this comes from the build host
+    DISTRO = platform.dist()[0]
+    RELEASE = platform.dist()[1]
+    open("softwarecenter/version.py", "w").write("""
 VERSION = '%s'
 CODENAME = '%s'
 DISTRO = '%s'
@@ -78,6 +53,7 @@
 
 # update po4a
 if sys.argv[1] == "build":
+    update_version()
     merge_authors_into_about_dialog()
     merge_extras_ubuntu_com_channel_file()
     call(["po4a", "po/help/po4a.conf"])
@@ -174,6 +150,5 @@
         "build_i18n": build_i18n.build_i18n,
         "build_help": build_help.build_help,
         "build_icons": build_icons.build_icons,
-        "lint": PocketLint,
     },
 )