From 3a4444530d7cf6c036813acd0d10305400fe842d Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Fri, 23 Jan 2015 09:54:13 +0000
Subject: Move python-requests to 'python-core'

It's already used in both 'cloudinit-support' and 'openstack-clients',
and will soon be used by lorry-controller too. Really anybody using
'urllib2' should be using 'requests' instead.
---
 strata/cloudinit-support.morph | 6 ------
 strata/openstack-clients.morph | 7 -------
 strata/python-core.morph       | 5 +++++
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.morph
index 399df685..14786dde 100644
--- a/strata/cloudinit-support.morph
+++ b/strata/cloudinit-support.morph
@@ -11,11 +11,6 @@ chunks:
   ref: 935a78736e4eb43b9fafae87f5e9902328673f63
   unpetrify-ref: baserock/morph
   build-depends: []
-- name: python-requests
-  repo: upstream:python-requests
-  ref: b891877ee6d76b0a3f8cbf2e7cd34cc4cbc40b6b
-  unpetrify-ref: baserock/morph
-  build-depends: []
 - name: python-prettytable
   morph: strata/cloudinit-support/python-prettytable.morph
   repo: upstream:python-prettytable
@@ -51,7 +46,6 @@ chunks:
   build-depends:
   - boto
   - configobj
-  - python-requests
   - python-prettytable
   - python-json-pointer
   - python-cheetah
diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph
index c4775219..1b348630 100644
--- a/strata/openstack-clients.morph
+++ b/strata/openstack-clients.morph
@@ -49,11 +49,6 @@ chunks:
   ref: ac5470ec9e68332ebc499c4f9f21e7e3cb31ecb6
   unpetrify-ref: baserock/morph
   build-depends: []
-- name: python-requests
-  repo: upstream:python-requests
-  ref: b891877ee6d76b0a3f8cbf2e7cd34cc4cbc40b6b
-  unpetrify-ref: baserock/morph
-  build-depends: []
 - name: simplejson
   repo: upstream:simplejson
   ref: 35816bfe2d0ddeb5ddcc68239683cbb35b7e3ff2
@@ -83,7 +78,6 @@ chunks:
   build-depends:
   - pyiso8601
   - python-prettytable
-  - python-requests
   - simplejson
   - netaddr
   - babel
@@ -105,6 +99,5 @@ chunks:
   - python-prettytable
   - argparse
   - pyiso8601
-  - python-requests
   - simplejson
   - babel
diff --git a/strata/python-core.morph b/strata/python-core.morph
index a76262f4..8758eaf7 100644
--- a/strata/python-core.morph
+++ b/strata/python-core.morph
@@ -15,3 +15,8 @@ chunks:
   unpetrify-ref: 0.10.7
   build-depends:
   - pip
+- name: python-requests
+  repo: upstream:python-requests
+  ref: b891877ee6d76b0a3f8cbf2e7cd34cc4cbc40b6b
+  unpetrify-ref: baserock/morph
+  build-depends: []
-- 
cgit v1.2.1