← Back to branch summary

~zulcss/nova/2013.2.b2

« back to all changes in this revision

Viewing changes to debian/patches/fix-requirements.patch

  • Committer: Chuck Short
  • Date: 2013-07-16 15:16:30 UTC
  • Revision ID: zulcss@ubuntu.com-20130716151630-dae5sgvwu1ch8rul
* New upstream release.
* debian/patches/fix-sqlalchemy-0.7.9-usage.patch: Temporary patch to address a FTBFS
  with sqlalchemy 0.7.9.
* debian/patches/avoid-failing-test.patch: Skip failing test on buildds.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-requirements.patch
1
 
diff -Naurp nova-2013.2.a1868.g6aa8a2c.orig/requirements.txt nova-2013.2.a1868.g6aa8a2c/requirements.txt
2
 
--- nova-2013.2.a1868.g6aa8a2c.orig/requirements.txt    2013-07-11 07:42:11.325841597 -0500
3
 
+++ nova-2013.2.a1868.g6aa8a2c/requirements.txt 2013-07-11 07:43:10.313841625 -0500
 
1
diff -Naurp nova-2013.2.a2028.gd612ed9.orig/requirements.txt nova-2013.2.a2028.gd612ed9/requirements.txt
 
2
--- nova-2013.2.a2028.gd612ed9.orig/requirements.txt    2013-07-16 09:36:27.193793953 -0400
 
3
+++ nova-2013.2.a2028.gd612ed9/requirements.txt 2013-07-16 10:03:41.741832923 -0400
4
4
@@ -1,6 +1,6 @@
5
5
 d2to1>=0.2.10,<0.3
6
6
 pbr>=0.5.16,<0.6
7
7
-SQLAlchemy>=0.7.8,<0.7.99
8
 
+SQLAlchemy>=0.7.8,<0.8.99
 
8
+SQLAlchemy>=0.7.8,<=0.8.99
9
9
 amqplib>=0.6.1
10
10
 anyjson>=0.2.4
11
11
 argparse
16
16
-requests>=1.1,<1.2.1 # order-dependent python-cinderclient req cap, bug 1182271
17
17
+requests>=1.1
18
18
 python-cinderclient>=1.0.1
19
 
 python-quantumclient>=2.2.0,<3.0.0
20
 
 python-glanceclient>=0.5.0,<2
 
19
 python-neutronclient>=2.2.3,<3.0.0
 
20
 python-glanceclient>=0.9.0
21
21
 python-keystoneclient>=0.2.0
22
22
 six
23
23
 stevedore>=0.9