From 29c49bbb2c3bf52b9ff37f49cd8c682a53882333 Mon Sep 17 00:00:00 2001 From: Ian Murray Date: Tue, 21 Aug 2012 15:13:27 +0100 Subject: [PATCH] Move pyutilib into conflict. --- requires/lucid_conflict.txt | 1 + requires/lucid_missing.txt | 2 -- requires/precise_conflict.txt | 1 + requires/precise_missing.txt | 2 -- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/requires/lucid_conflict.txt b/requires/lucid_conflict.txt index b8609bd9509..12d20d00419 100644 --- a/requires/lucid_conflict.txt +++ b/requires/lucid_conflict.txt @@ -17,3 +17,4 @@ paste==1.7.5.1 repoze.who.plugins.openid==0.5.3 repoze.who==1.0.19 repoze.who-friendlyform==1.0.8 +pyutilib.component.core==4.5.3 diff --git a/requires/lucid_missing.txt b/requires/lucid_missing.txt index 3f310ab517f..c4b54518848 100644 --- a/requires/lucid_missing.txt +++ b/requires/lucid_missing.txt @@ -6,8 +6,6 @@ -e git+https://github.com/okfn/vdm.git@vdm-0.11#egg=vdm # Packages already on pypi.python.org -pyutilib.component.core==4.5.3 - solrpy==0.9.5 formalchemy==1.4.2 pairtree==0.7.1-T diff --git a/requires/precise_conflict.txt b/requires/precise_conflict.txt index 0b537c933a1..fe55590792a 100644 --- a/requires/precise_conflict.txt +++ b/requires/precise_conflict.txt @@ -18,3 +18,4 @@ repoze.who-friendlyform==1.0.8 babel==0.9.6 # markupsafe is required by webhelpers==1.2 required by formalchemy with SQLAlchemy 0.6 markupsafe==0.15 +pyutilib.component.core==4.5.3 diff --git a/requires/precise_missing.txt b/requires/precise_missing.txt index c4ed4ad6c35..eeda91a5e96 100644 --- a/requires/precise_missing.txt +++ b/requires/precise_missing.txt @@ -6,8 +6,6 @@ -e git+https://github.com/okfn/vdm.git@vdm-0.11#egg=vdm # Packages already on pypi.python.org -pyutilib.component.core==4.5.3 - solrpy==0.9.5 formalchemy==1.4.2 pairtree==0.7.1-T