Merge lp:~mterry/snapcraft/debian-packaging into lp:~snappy-dev/snapcraft/core

[Michael Terry]

Add debian packaging.

Add debian packaging.

I've also added a setup.py to make building snapcraft follow python conventions. And I've made bin/snapcraft look at whether it's running from trunk or an installed system and look for its data files appropriately.

[Ricardo Salveti (rsalveti)]

Got the following when building with sbuild:

py3versions: no X-Python3-Version in control file, using supported versions
dh clean --with python3
   dh_testdir
   dh_auto_clean
Can't exec "pyversions": No such file or directory at /usr/share/perl5/Debian/Debhelper/Buildsystem/python_distutils.pm line 120.

From my system that is provided by python3-minimal, wonder if we need to manually depend on that instead.

review: Needs Fixing

[Michael Terry (mterry)]

Ah yes, I forgot the critical step of building in a chroot. /.\

Fixed now.

[Michael Vogt (mvo)]

Thanks, this looks good, great to see that the packaging is there now! I have one minor idea/suggestion inline but not important at all, this can land as is.

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~mterry/snapcraft/debian-packaging into lp:snapcraft failed. Below is the output from the failed tests.

/bin/sh: 1: ./.tarmac.sh: not found

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~mterry/snapcraft/debian-packaging into lp:snapcraft failed. Below is the output from the failed tests.

++ pwd
+ export PATH=/tmp/tarmac/branch.FpXQ_I/bin:/usr/bin:/bin
+ PATH=/tmp/tarmac/branch.FpXQ_I/bin:/usr/bin:/bin
++ pwd
+ export PYTHONPATH=/tmp/tarmac/branch.FpXQ_I:
+ PYTHONPATH=/tmp/tarmac/branch.FpXQ_I:
+ SRC_PATHS='bin snapcraft tests/unit'
+ pep8 bin snapcraft tests/unit --ignore=E501
./runtests.sh: line 26: pep8: command not found

=== modified file '.bzrignore'
--- .bzrignore	2015-06-26 11:25:17 +0000
+++ .bzrignore	2015-07-06 23:36:08 +0000
@@ -1,3 +1,6 @@
 **/parts/
 **/snap/
 **/stage/
+build
+dist
+*.egg-info

=== modified file 'bin/snapcraft'
--- bin/snapcraft	2015-07-02 13:26:46 +0000
+++ bin/snapcraft	2015-07-06 23:36:08 +0000
@@ -19,8 +19,19 @@
 import os
 import sys
 
-sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
+inTrunk = False
+topdir = os.path.abspath(os.path.join(__file__, "..", ".."))
+if os.path.exists(os.path.join(topdir, 'setup.py')):
+    inTrunk = True
+    sys.path.append(topdir)
+
 import snapcraft.cmds
+import snapcraft.common
+
+if inTrunk:
+    snapcraft.common.plugindir = os.path.join(topdir, 'plugins')
+else:
+    snapcraft.common.plugindir = os.path.join(topdir, 'share', 'snapcraft', 'plugins')
 
 root_parser = argparse.ArgumentParser()
 subparsers = root_parser.add_subparsers(dest='cmd')

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2015-07-06 23:36:08 +0000
@@ -0,0 +1,5 @@
+snapcraft (0) UNRELEASED; urgency=low
+
+  * Testing (just a dummy changelog, will be replaced by daily build scripts)
+
+ -- Michael Terry <[e-mail]>  Mon, 6 Jul 2015 21:55:21 -0500

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2015-07-06 23:36:08 +0000
@@ -0,0 +1,1 @@
+9

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2015-07-06 23:36:08 +0000
@@ -0,0 +1,25 @@
+Source: snapcraft
+Section: utils
+Priority: extra
+Maintainer: Snapcraft Team <[e-mail]>
+Build-Depends: debhelper (>= 9),
+               dh-python,
+               pep8,
+               plainbox,
+               pyflakes,
+               python3,
+               python3-setuptools,
+               python3-yaml,
+Homepage: https://launchpad.net/snapcraft
+Standards-Version: 3.9.6
+
+Package: snapcraft
+Architecture: any
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         python3-yaml,
+Description: easily craft snaps
+ Snapcraft aims to make upstream developers' lives easier and as such is not
+ a single toolset, but instead is a collection of tools that enable the
+ natural workflow of an upstream to be extended with a simple release step
+ into Snappy.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2015-07-06 23:36:08 +0000
@@ -0,0 +1,22 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Snapcraft
+Upstream-Contact: Snapcraft Team <[e-mail]>
+Source: https://launchpad.net/snapcraft
+
+Files: *
+Copyright: 2015 Canonical Ltd
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 3 as
+ published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file /usr/share/common-licenses/GPL-3.

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2015-07-06 23:36:08 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+# -*- Mode:Makefile; indent-tabs-mode:t; tab-width:4 -*-
+
+%:
+	dh $@ --with python3 --buildsystem=pybuild
+
+override_dh_auto_test:
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	python3 setup.py test
+endif
+

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2015-07-06 23:36:08 +0000
@@ -0,0 +1,1 @@
+3.0 (native)

=== added file 'debian/source/options'
--- debian/source/options	1970-01-01 00:00:00 +0000
+++ debian/source/options	2015-07-06 23:36:08 +0000
@@ -0,0 +1,7 @@
+# Ignore standard files (like .bzr)
+tar-ignore
+
+# Ignore examples folder because it likely contains a bunch of stuff we don't
+# care about (like downloaded go1.4 binaries and such).  It's not important
+# for it to be distributed with the source.
+tar-ignore = "examples"

=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2015-07-06 23:36:08 +0000
@@ -0,0 +1,41 @@
+#!/usr/bin/env python3
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
+#
+# Copyright (C) 2015 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import subprocess
+
+from setuptools import setup
+from setuptools.command.test import test
+
+
+class TestCommand(test):
+    def run(self):
+        subprocess.check_call(['./runtests.sh'])
+
+
+setup(name="snapcraft",
+      version="0",
+      description="Easily craft snaps",
+      author_email="[e-mail]",
+      url="https://launchpad.net/snapcraft",
+      packages=['snapcraft',
+                'snapcraft.plugins'],
+      package_data={'snapcraft.plugins': ['manifest.txt']},
+      scripts=['bin/snapcraft'],
+      data_files=[('share/snapcraft/plugins', ['plugins/' + x for x in os.listdir('plugins')])],
+      cmdclass={'test': TestCommand},
+)

=== modified file 'snapcraft/common.py'
--- snapcraft/common.py	2015-07-02 14:16:40 +0000
+++ snapcraft/common.py	2015-07-06 23:36:08 +0000
@@ -45,3 +45,5 @@
 commandOrder = ["pull", "build", "stage", "snap"]
 stagedir = os.path.join(os.getcwd(), "stage")
 snapdir = os.path.join(os.getcwd(), "snap")
+
+plugindir = '/usr/share/snapcraft/plugins'

=== modified file 'snapcraft/plugin.py'
--- snapcraft/plugin.py	2015-07-02 20:27:20 +0000
+++ snapcraft/plugin.py	2015-07-06 23:36:08 +0000
@@ -37,9 +37,7 @@
         self.statefile = os.path.join(os.getcwd(), "parts", partName, "state")
 
         if loadConfig:
-            # FIXME: use env var for this
-            pluginDir = os.path.abspath(os.path.join(__file__, '..', '..', 'plugins'))
-            configPath = os.path.join(pluginDir, name + ".yaml")
+            configPath = os.path.join(snapcraft.common.plugindir, name + ".yaml")
             if not os.path.exists(configPath):
                 snapcraft.common.log("Missing config for part %s" % (name), file=sys.stderr)
                 return