From e885a05f273cf0dda181d4a4cda22be2949fece3 Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richard.ipsum@codethink.co.uk>
Date: Mon, 17 Nov 2014 14:12:56 +0000
Subject: Use patched version of setuptools 7.0

There are two versions of setuptools, a bitbucket branch[1]
and a 0.6 branch that lives in sandbox on svn.python.org[2]
0.6 is still maintained but most active development happens
on bitbucket.

This patch moves us onto using setuptools from bitbucket.
We have patched setuptools to allow our import tool to get
information on build dependencies from python packages.

A pull request for our setuptools patch has been submitted upstream[3]

Since there seems to be a bug in setuptools' master branch that prevents
setuptools from being bootstrapped correctly, we are for the moment
based off 7.0 (the most recent release of setuptools)

[1]: https://bitbucket.org/pypa/setuptools
[2]: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/
[3]: https://bitbucket.org/pypa/setuptools/pull-request/106/make-egg_info-command-write-out-setup/diff
---
 strata/core.morph | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/strata/core.morph b/strata/core.morph
index 0a8122fd..37133fee 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -279,9 +279,9 @@ chunks:
   - texinfo-tarball
 - name: python-setuptools
   morph: strata/core/python-setuptools.morph
-  repo: upstream:python-setuptools
-  ref: 05b07a427a1eae2a51d527f7ac5135a8fd215d77
-  unpetrify-ref: baserock/morph
+  repo: upstream:python-setuptools-bitbucket
+  ref: 0aa6a4de5931d02876428388678802db2371fd37
+  unpetrify-ref: baserock/master
   build-depends:
   - cpython
 - name: pyyaml
-- 
cgit v1.2.1


From 55d072e22cef960a261bcc506f994311d48a75e4 Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richard.ipsum@codethink.co.uk>
Date: Wed, 19 Nov 2014 11:50:50 +0000
Subject: Add python-tools stratum, containing pip

---
 strata/python-tools.morph | 12 ++++++++++++
 strata/webtools.morph     |  7 +------
 2 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 strata/python-tools.morph

diff --git a/strata/python-tools.morph b/strata/python-tools.morph
new file mode 100644
index 00000000..8b82c775
--- /dev/null
+++ b/strata/python-tools.morph
@@ -0,0 +1,12 @@
+name: python-tools
+kind: stratum
+description: "A stratum for non-essential python tools:
+useful python tools that we don't want to include in core."
+build-depends:
+- morph: strata/core.morph
+chunks:
+- name: pip
+  repo: upstream:pip
+  ref: d4b691b743a91500cf49119d28a805db8313f129
+  unpetrify-ref: master
+  build-depends: []
diff --git a/strata/webtools.morph b/strata/webtools.morph
index 8df32e9c..39175747 100644
--- a/strata/webtools.morph
+++ b/strata/webtools.morph
@@ -1,6 +1,6 @@
 name: webtools
 kind: stratum
-description: pip, node and other fun things
+description: web things
 build-depends:
 - morph: strata/tools.morph
 - morph: strata/pcre-utils.morph
@@ -22,11 +22,6 @@ chunks:
   ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37 
   unpetrify-ref: baserock/release_1_28
   build-depends: []
-- name: pip
-  repo: upstream:pip.git
-  ref: d4b691b743a91500cf49119d28a805db8313f129
-  unpetrify-ref: master
-  build-depends: []
 - name: nginx
   morph: strata/webtools/nginx.morph
   repo: upstream:nginx
-- 
cgit v1.2.1


From b56462082d9216db0403dac0e6c1833d4d29b4be Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richard.ipsum@codethink.co.uk>
Date: Wed, 19 Nov 2014 15:56:10 +0000
Subject: Add python-tools stratum to devel systems

---
 systems/devel-system-armv7-chroot.morph       | 2 ++
 systems/devel-system-armv7-highbank.morph     | 2 ++
 systems/devel-system-armv7-versatile.morph    | 2 ++
 systems/devel-system-armv7-wandboard.morph    | 2 ++
 systems/devel-system-armv7b-chroot.morph      | 2 ++
 systems/devel-system-armv7b-highbank.morph    | 2 ++
 systems/devel-system-armv7lhf-chroot.morph    | 2 ++
 systems/devel-system-armv7lhf-highbank.morph  | 2 ++
 systems/devel-system-armv7lhf-jetson.morph    | 2 ++
 systems/devel-system-armv7lhf-wandboard.morph | 2 ++
 systems/devel-system-ppc64-chroot.morph       | 2 ++
 systems/devel-system-ppc64-generic.morph      | 2 ++
 systems/devel-system-x86_32-chroot.morph      | 2 ++
 systems/devel-system-x86_32-generic.morph     | 2 ++
 systems/devel-system-x86_64-chroot.morph      | 2 ++
 systems/devel-system-x86_64-generic.morph     | 2 ++
 systems/devel-system-x86_64-vagrant.morph     | 2 ++
 17 files changed, 34 insertions(+)

diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index 40c07312..466df31f 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -27,6 +27,8 @@ strata:
   morph: strata/lorry.morph
 - name: baserock-import
   morph: strata/baserock-import.morph
+- name: python-tools
+  morph: strata/python-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
index f34d3978..ed111387 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -30,6 +30,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-tools
+  morph: strata/python-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
index 7ad8cac8..6b24e603 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -30,6 +30,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-tools
+  morph: strata/python-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
index 6abba894..70c6f1cc 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -30,6 +30,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-tools
+  morph: strata/python-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
index ad3a145c..1f5bf1cf 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -21,6 +21,8 @@ strata:
   morph: strata/openstack-clients.morph
 - name: baserock-import
   morph: strata/baserock-import.morph
+- name: python-tools
+  morph: strata/python-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph
index 6804c7fb..7e703134 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -24,6 +24,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-tools
+  morph: strata/python-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index 5e04376c..02358014 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -27,6 +27,8 @@ strata:
   morph: strata/lorry.morph
 - name: baserock-import
   morph: strata/baserock-import.morph
+- name: python-tools
+  morph: strata/python-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index 25328020..8fe3737b 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -31,6 +31,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-tools
+  morph: strata/python-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index 1ee4581b..550c361a 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -31,6 +31,8 @@ strata:
   morph: strata/lorry.morph
 - name: baserock-import
   morph: strata/baserock-import.morph
+- name: python-tools
+  morph: strata/python-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
index 92674a2a..9e8f0bc6 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -31,6 +31,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-tools
+  morph: strata/python-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index ddfd1f20..a60f35fc 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -25,6 +25,8 @@ strata:
   morph: strata/lorry.morph
 - name: baserock-import
   morph: strata/baserock-import.morph
+- name: python-tools
+  morph: strata/python-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
index 8aeaf266..6f7fd319 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -28,6 +28,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-tools
+  morph: strata/python-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
index a54eef52..52e64847 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -29,6 +29,8 @@ strata:
   morph: strata/lorry.morph
 - name: baserock-import
   morph: strata/baserock-import.morph
+- name: python-tools
+  morph: strata/python-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
index ef5d4b90..8d484e81 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -32,6 +32,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-tools
+  morph: strata/python-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
index 84d63f5d..e77aa5d1 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -29,6 +29,8 @@ strata:
   morph: strata/lorry.morph
 - name: baserock-import
   morph: strata/baserock-import.morph
+- name: python-tools
+  morph: strata/python-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index 9334fca0..143ceb82 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -32,6 +32,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-tools
+  morph: strata/python-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index f2f849ca..a7731cad 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -30,6 +30,8 @@ strata:
   morph: strata/lorry.morph
 - name: baserock-import
   morph: strata/baserock-import.morph
+- name: python-tools
+  morph: strata/python-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
-- 
cgit v1.2.1