Merge lp:~cr3/checkbox/1049218 into lp:checkbox

[Marc Tardif]

Here we go again, please see if this merge request fixes the problem with the required dependency on distutils-extra. Thanks!

[lp:~cr3/checkbox/1049218]

1668. By Marc Tardif on 2012-09-12

Merged from trunk.

1669. By Marc Tardif on 2012-09-12

Re-fixed setup.py to be PEP8 compliant.

1670. By Marc Tardif on 2012-09-12

Re-fixed required dependency on distutils-extra by providing fake implementations of build_i18n and build_icons.

1671. By Marc Tardif on 2012-09-12

Re-added Launchpad bug number to debian/changelog.

[Marc Tardif (cr3)]

Sorry about that, I had to re-apply the changes I pushed to trunk accidentally and reverted. The diff in this merge request should look good once Launchpad finally finishes updating the diff. Again, sorry for all the noise :)

review: Needs Resubmitting

[Marc Tardif (cr3)]

For your reassurance, even though this merge request is for the trunk of the project which uses Python3, the same changes could be ported back to Precise which uses Python2. We're actually working on an SRU for Precise this iteration so the timing is perfect. You could then have a tarball with the fix shortly.

[Kevin McDermott (bigkevmcd)]

Thanks for the fix...

Looks good to me, running it yields one error (but this is not related to this branch AFAICT)

...
creating /home/kevin/.virtualenvs/cr3/lib/checkbox
creating /home/kevin/.virtualenvs/cr3/lib/checkbox/qt
copying qt/checkbox-qt.ui -> /home/kevin/.virtualenvs/cr3/lib/checkbox/qt/
error: can't copy 'qt/frontend/checkbox-qt-service': doesn't exist or not a regular file

+1 from me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-12 19:03:54 +0000
+++ debian/changelog	2012-09-12 19:14:20 +0000
@@ -50,6 +50,8 @@
   * patch/0.14.2: Fixed patch to rmtree instead of rmdir scripts directory.
   * [FEATURE] debian/checkbox.templates, debian/checkbox.config: Added support to
     preseed properties in environment_info plugin.
+  * setup.py: Fixed required dependency on distutils-extra by providing
+    fake implementations of build_i18n and build_icons (LP #1049218)
 
   [Sean Feole]
   * [FEATURE] scripts/battery_test: measures battery capacity before and after

=== modified file 'setup.py'
--- setup.py	2012-09-12 19:03:54 +0000
+++ setup.py	2012-09-12 19:14:20 +0000
@@ -15,21 +15,44 @@
 from distutils.command.install import install
 from distutils.command.install_data import install_data
 from distutils.command.install_scripts import install_scripts
-from DistUtilsExtra.command.build_extra import build_extra
-from DistUtilsExtra.command.build_i18n import build_i18n
-from DistUtilsExtra.command.build_icons import build_icons
+try:
+    from DistUtilsExtra.command.build_extra import build_extra
+    from DistUtilsExtra.command.build_i18n import build_i18n
+    from DistUtilsExtra.command.build_icons import build_icons
+except ImportError:
+    from distutils.cmd import Command
+
+    class build_extra(build):
+        """Adds fake support for i18n and icons to the build target."""
+        def __init__(self, dist):
+            build.__init__(self, dist)
+            self.user_options.extend([("i18n", None, "use the localisation"),
+                                      ("icons", None, "use icons"),
+                                     ])
+
+        def initialize_options(self):
+            build.initialize_options(self)
+            self.i18n = False
+            self.icons = False
+
+    class build_i18n(Command):
+        """Placeholder concrete class for fake i18n support."""
+
+    class build_icons(Command):
+        """Placeholder concrete class for fake icons support."""
 
 
 def changelog_version(changelog="debian/changelog"):
     version = "dev"
     if posixpath.exists(changelog):
-        head=open(changelog).readline()
+        head = open(changelog).readline()
         match = re.compile(".*\((.*)\).*").match(head)
         if match:
             version = match.group(1)
 
     return version
 
+
 def expand_data_files(data_files):
     for f in data_files:
         if type(f) != str:
@@ -45,6 +68,7 @@
 
     return data_files
 
+
 def extract_sources_from_data_files(data_files):
     all_sources = []
     data_files = expand_data_files(data_files)
@@ -53,10 +77,12 @@
 
     return all_sources
 
+
 def extract_executables_from_data_files(data_files):
     sources = extract_sources_from_data_files(data_files)
     return [os.path.splitext(s)[0] for s in sources]
 
+
 def substitute_variables(infile, outfile, variables={}):
     file_in = open(infile, "r")
     file_out = open(outfile, "w")
@@ -86,7 +112,8 @@
         cc = new_compiler()
         for source in self.sources:
             executable = os.path.splitext(source)[0]
-            cc.link_executable([source], executable, libraries=["rt", "pthread"])
+            cc.link_executable(
+                [source], executable, libraries=["rt", "pthread"])
 
 
 class checkbox_clean(clean, object):
@@ -202,26 +229,29 @@
 
 
 setup(
-    name = "checkbox",
-    version = changelog_version(),
-    author = "Marc Tardif",
-    author_email = "[e-mail]",
-    license = "GPL",
-    description = "Checkbox System Testing",
-    long_description = """
+    name="checkbox",
+    version=changelog_version(),
+    author="Marc Tardif",
+    author_email="[e-mail]",
+    license="GPL",
+    description="Checkbox System Testing",
+    long_description="""
 This project provides an extensible interface for system testing.
 """,
-    data_files = [
-        ("lib/checkbox/qt/", ["qt/checkbox-qt.ui", "qt/*.png", "qt/frontend/checkbox-qt-service"]),
+    data_files=[
+        ("lib/checkbox/qt/",
+            ["qt/checkbox-qt.ui", "qt/*.png",
+             "qt/frontend/checkbox-qt-service"]),
         ("share/checkbox/", ["backend", "run"]),
-        ("share/checkbox/data/audio/", ["data/audio/*"]), 
-        ("share/checkbox/data/documents/", ["data/documents/*"]), 
-        ("share/checkbox/data/images/", ["data/images/*.*"]), 
-        ("share/checkbox/data/images/oem-config", ["data/images/oem-config/*"]), 
-        ("share/checkbox/data/video/", ["data/video/*"]), 
-        ("share/checkbox/data/settings/", ["data/settings/*"]), 
-        ("share/checkbox/data/websites/", ["data/websites/*"]), 
-        ("share/checkbox/data/whitelists/", ["data/whitelists/*"]), 
+        ("share/checkbox/data/audio/", ["data/audio/*"]),
+        ("share/checkbox/data/documents/", ["data/documents/*"]),
+        ("share/checkbox/data/images/", ["data/images/*.*"]),
+        ("share/checkbox/data/images/oem-config",
+            ["data/images/oem-config/*"]),
+        ("share/checkbox/data/video/", ["data/video/*"]),
+        ("share/checkbox/data/settings/", ["data/settings/*"]),
+        ("share/checkbox/data/websites/", ["data/websites/*"]),
+        ("share/checkbox/data/whitelists/", ["data/whitelists/*"]),
         ("share/checkbox/examples/", ["examples/*"]),
         ("share/checkbox/install/", ["install/*"]),
         ("share/checkbox/patches/", ["patches/*"]),
@@ -233,12 +263,14 @@
         ("share/dbus-1/services/", ["qt/com.canonical.QtCheckbox.service"]),
         ("share/apport/package-hooks/", ["apport/source_checkbox.py"]),
         ("share/apport/general-hooks/", ["apport/checkbox.py"])],
-    scripts = ["bin/checkbox-cli", "bin/checkbox-gtk", "bin/checkbox-urwid", "bin/checkbox-qt"],
-    packages = ["checkbox", "checkbox.contrib", "checkbox.lib", "checkbox.parsers",
-        "checkbox.reports", "checkbox_cli", "checkbox_gtk", "checkbox_urwid", "checkbox_qt"],
-    package_data = {
+    scripts=["bin/checkbox-cli", "bin/checkbox-gtk",
+             "bin/checkbox-urwid", "bin/checkbox-qt"],
+    packages=["checkbox", "checkbox.contrib", "checkbox.lib",
+              "checkbox.parsers", "checkbox.reports", "checkbox_cli",
+              "checkbox_gtk", "checkbox_urwid", "checkbox_qt"],
+    package_data={
         "": ["cputable"]},
-    cmdclass = {
+    cmdclass={
         "build": checkbox_build,
         "build_i18n": build_i18n,
         "build_icons": checkbox_build_icons,