summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-10 18:12:41 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-10 18:12:41 (GMT)
commit28b9acf5b5ff39b132feb4e04dff0aaf77dfef9a (patch)
tree4db77d7cf537f6ddc50b0a6248084970739169b0
parentf46b33f777d1afa46479bbd366ea6ae256686efa (diff)
parent2d149759eebb8f56502724cab2884c8bdc4e192a (diff)
downloaddefinitions-28b9acf5b5ff39b132feb4e04dff0aaf77dfef9a.tar.gz
Merge branch 'sam/requests-to-core'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Mike Smith <mike.smith@codethink.co.uk>
-rw-r--r--strata/cloudinit-support.morph6
-rw-r--r--strata/openstack-clients.morph7
-rw-r--r--strata/python-core.morph5
3 files changed, 5 insertions, 13 deletions
diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.morph
index 399df68..14786dd 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 c477521..1b34863 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 a76262f..ca07449 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: b83131779c701720a9ae9efae78996277d416269
+ unpetrify-ref: v2.5.1
+ build-depends: []