From 62d1a56a6629c287a1fe88040a893f401276b86c Mon Sep 17 00:00:00 2001
From: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
Date: Wed, 29 Apr 2015 11:19:09 +0000
Subject: Move python-decorator and networkx to python-common

Change-Id: Ifa9fd4a7561bb92e4ae579ea5028bef76d68efa1
---
 strata/baserock-import.morph    | 10 ----------
 strata/openstack-services.morph | 15 ---------------
 strata/python-common.morph      |  8 ++++++++
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph
index c0861105..5623886e 100644
--- a/strata/baserock-import.morph
+++ b/strata/baserock-import.morph
@@ -9,14 +9,6 @@ chunks:
   repo: upstream:python-packages/ansicolor
   ref: 9d3adbaff35bb6cde1d63414a8cc72f572c4d0ef
   unpetrify-ref: 0.2.4
-- name: python-decorator
-  repo: upstream:python-packages/python-decorator
-  ref: b02f7a254c3679dfac57a824e08dd02ced850636
-  unpetrify-ref: decorator-3.4.0
-- name: networkx
-  repo: upstream:python-packages/networkx
-  ref: 8ac796aba866ade1a56b83e30f25ed392ca3512c
-  unpetrify-ref: networkx-1.9.1
 - name: requests-cache
   repo: upstream:python-packages/requests-cache
   ref: a1b5e65ccd715f1e8434f18f27913715340d6aaf
@@ -27,5 +19,3 @@ chunks:
   unpetrify-ref: master
   build-depends:
   - ansicolor
-  - networkx
-  - python-decorator
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index 2a984922..04e8fd8e 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -143,10 +143,6 @@ chunks:
   - pygments
   - pystache
   - smartypants
-- name: python-decorator
-  repo: upstream:python-packages/python-decorator
-  ref: b02f7a254c3679dfac57a824e08dd02ced850636
-  unpetrify-ref: decorator-3.4.0
 - name: dateutil
   repo: upstream:python-packages/dateutil
   ref: 8c6026ba09716a4e164f5420120bfe2ebb2d9d82
@@ -206,12 +202,6 @@ chunks:
   ref: 8ffb4739d596fb1aac5d62d173d1e6f80270af9d
   unpetrify-ref: v2.1.fb52
   morph: strata/openstack-services/rtslib-fb.morph
-- name: networkx
-  repo: upstream:python-packages/networkx
-  ref: 8ac796aba866ade1a56b83e30f25ed392ca3512c
-  unpetrify-ref: v1.9.1
-  build-depends:
-  - python-decorator
 - name: pexpect
   repo: upstream:python-packages/pexpect
   ref: 671417beb41c21f772687c565196fdde444b053b
@@ -226,7 +216,6 @@ chunks:
   unpetrify-ref: 1.2.3
   build-depends:
   - ply
-  - python-decorator
 - name: logutils
   repo: upstream:python-packages/logutils.git
   ref: 095f14efbaaf838b7772bffd36a466abb9668efe
@@ -301,15 +290,12 @@ chunks:
   repo: upstream:openstack/taskflow
   ref: 1caaecc5d6b2aa4cde4a50e31d1d993fce7a66c4
   unpetrify-ref: 0.5.0
-  build-depends:
-  - networkx
 - name: sqlalchemy-migrate
   repo: upstream:python-packages/sqlalchemy-migrate
   ref: 089663761cc15f8b3cdb874b6a76270ccdd0a412
   unpetrify-ref: 0.9.1
   build-depends:
   - sqlalchemy
-  - python-decorator
   - tempita
 - name: oauthlib
   repo: upstream:python-packages/oauthlib
@@ -455,7 +441,6 @@ chunks:
   - sqlalchemy
   - anyjson
   - boto
-  - python-decorator
   - keystonemiddleware
   - kombu
   - routes
diff --git a/strata/python-common.morph b/strata/python-common.morph
index affbb7f0..54048ed7 100644
--- a/strata/python-common.morph
+++ b/strata/python-common.morph
@@ -60,3 +60,11 @@ chunks:
   repo: upstream:python-packages/webob
   ref: ae0ac90f22f9e1ff351e445f92330efd89195f51
   unpetrify-ref: 1.4
+- name: python-decorator
+  repo: upstream:python-packages/python-decorator
+  ref: b02f7a254c3679dfac57a824e08dd02ced850636
+  unpetrify-ref: decorator-3.4.0
+- name: networkx
+  repo: upstream:python-packages/networkx
+  ref: 8ac796aba866ade1a56b83e30f25ed392ca3512c
+  unpetrify-ref: networkx-1.9.1
-- 
cgit v1.2.1