Merge lp:~sergiusens/snapcraft/build-packages into lp:~ted/snapcraft/python-pip

[Sergio Schvezov]

build-packages instead of build-tools to follow the spec

Unmerged revisions

179. By Sergio Schvezov on 2015-09-18

build-packages instead of build-tools to follow the spec

178. By Ted Gould on 2015-09-18

Add in support for PIP requirements.txt files in the python plugins. by ted approved by sergiusens

177. By Daniel Holbach on 2015-09-18

add libgudev-1.0-dev as build-tools for godd example by dholbach approved by sergiusens

176. By Sergio Schvezov on 2015-09-17

setup.py using pypy to setup a config integration test by sergiusens approved by elopio

=== modified file 'examples/godd/snapcraft.yaml'
--- examples/godd/snapcraft.yaml	2015-09-08 11:48:30 +0000
+++ examples/godd/snapcraft.yaml	2015-09-18 14:55:41 +0000
@@ -11,3 +11,5 @@
   godd:
     type: go-project
     source: git://github.com/mvo5/godd
+build-packages: 
+    - libgudev-1.0-dev

=== modified file 'plugins/ant-project.yaml'
--- plugins/ant-project.yaml	2015-09-15 09:49:19 +0000
+++ plugins/ant-project.yaml	2015-09-18 14:55:41 +0000
@@ -10,5 +10,5 @@
   stage-packages:
   snap:
   stage:
-build-tools:
+build-packages:
   - ant

=== modified file 'plugins/autotools-project.yaml'
--- plugins/autotools-project.yaml	2015-09-08 18:06:03 +0000
+++ plugins/autotools-project.yaml	2015-09-18 14:55:41 +0000
@@ -1,5 +1,5 @@
 module: autotools_project
-build-tools: [autoconf, automake, autopoint]
+build-packages: [autoconf, automake, autopoint]
 options:
   source:
     required: true

=== modified file 'plugins/cmake-project.yaml'
--- plugins/cmake-project.yaml	2015-09-08 18:06:03 +0000
+++ plugins/cmake-project.yaml	2015-09-18 14:55:41 +0000
@@ -1,5 +1,5 @@
 module: cmake_project
-build-tools: [cmake]
+build-packages: [cmake]
 options:
   source:
     required: true

=== modified file 'plugins/go.yaml'
--- plugins/go.yaml	2015-08-14 20:04:30 +0000
+++ plugins/go.yaml	2015-09-18 14:55:41 +0000
@@ -1,2 +1,2 @@
-build-tools:
+build-packages:
   - golang-go

=== modified file 'plugins/make-project.yaml'
--- plugins/make-project.yaml	2015-09-08 18:06:03 +0000
+++ plugins/make-project.yaml	2015-09-18 14:55:41 +0000
@@ -1,5 +1,5 @@
 module: make_project
-build-tools: [make]
+build-packages: [make]
 options:
   source:
     required: true

=== modified file 'plugins/maven-project.yaml'
--- plugins/maven-project.yaml	2015-09-08 18:06:03 +0000
+++ plugins/maven-project.yaml	2015-09-18 14:55:41 +0000
@@ -1,5 +1,5 @@
 module: maven_project
-build-tools:
+build-packages:
   - maven
 requires:
   - jdk

=== modified file 'snapcraft/yaml.py'
--- snapcraft/yaml.py	2015-09-18 03:23:38 +0000
+++ snapcraft/yaml.py	2015-09-18 14:55:41 +0000
@@ -75,7 +75,7 @@
         self.data = _snapcraft_yaml_load()
         _validate_snapcraft_yaml(self.data)
 
-        self.build_tools = self.data.get('build-tools', [])
+        self.build_tools = self.data.get('build-packages', [])
 
         for part_name in self.data.get("parts", []):
             properties = self.data["parts"][part_name] or {}
@@ -160,7 +160,7 @@
     def load_plugin(self, part_name, plugin_name, properties, load_code=True):
         part = snapcraft.plugin.load_plugin(part_name, plugin_name, properties, load_code=load_code)
 
-        self.build_tools += part.config.get('build-tools', [])
+        self.build_tools += part.config.get('build-packages', [])
         self.all_parts.append(part)
         return part