~zulcss/nova/house-cleaning

« back to all changes in this revision

Viewing changes to debian/patches/avoid_requirements_cheetah.patch

  • Committer: Chuck Short
  • Date: 2013-07-30 14:29:02 UTC
  • Revision ID: zulcss@ubuntu.com-20130730142902-slhz5fokgjsak57k
* New usptream release. 
* debian/patches/avoid_requirements_cheetah.patch: Dropped
* debian/patches/fix-sqlalchemy-0.7.9-usage.patch: Dropped
* debian/patches/fix-requirements.patch: Refreshed.
* debian/patches/remove-deprecated-sqlalchemy-option.patch: Remove
  deprecated option with sqlalchemy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
From: Adam Gandelman <adamg@ubuntu.com>
2
 
Date: Wed May 29 12:13:38 PDT 2013
3
 
Subject: Avoid Cheetah dependency.
4
 
Ubuntu-bug: https://bugs.launchpad.net/ubuntu/+source/cheetah/+bug/1183634
5
 
Until Cheetah's dependencies have been MIR'd into Main, avoid it
6
 
being listed in requirements.txt and requiring it as a runtime
7
 
dependency.
8
 
 
9
 
 
10
 
Index: nova-src/requirements.txt
11
 
===================================================================
12
 
--- nova-src.orig/requirements.txt      2013-06-19 18:03:08.469447733 -0700
13
 
+++ nova-src/requirements.txt   2013-06-19 18:03:08.465447733 -0700
14
 
@@ -1,7 +1,6 @@
15
 
 d2to1>=0.2.10,<0.3
16
 
 pbr>=0.5.16,<0.6
17
 
 SQLAlchemy>=0.7.8,<0.7.99
18
 
-Cheetah>=2.4.4
19
 
 amqplib>=0.6.1
20
 
 anyjson>=0.2.4
21
 
 argparse