1 In-house patch to remove unnecessary dependencies from Glance's |
1 In-house patch to remove unnecessary dependencies from Glance's |
2 requirements files. The specific reasons are as follows: |
2 requirements files. The specific reasons are as follows: |
3 |
3 |
4 lxml No longer applicable |
4 boto Not applicable |
5 (upstream commit b7f9120cd4623d8284c4edfea760ef10e1193492) |
|
6 |
5 |
7 passlib No longer applicable |
6 cinderclient Not applicable |
8 (upstream commit b31874284212d49560ddf4f36e5c9ca5d221f605) |
7 |
|
8 greenlet Not applicable |
|
9 |
|
10 kombu Not applicable |
|
11 |
|
12 oslo.vmware Not applicable |
9 |
13 |
10 pycrypto Not applicable to Solaris (M2Crypto used instead) |
14 pycrypto Not applicable to Solaris (M2Crypto used instead) |
11 |
15 |
12 wsgiref No longer applicable |
16 swiftclient Not applicable |
13 (upstream commit b31874284212d49560ddf4f36e5c9ca5d221f605) |
|
14 |
17 |
15 --- glance-2013.2.3/glance.egg-info/requires.txt.orig 2014-04-03 11:46:54.000000000 -0700 |
18 --- glance-2014.2.2/glance.egg-info/requires.txt.~1~ 2015-02-05 07:21:46.000000000 -0800 |
16 +++ glance-2013.2.3/glance.egg-info/requires.txt 2014-05-24 23:04:42.210143004 -0700 |
19 +++ glance-2014.2.2/glance.egg-info/requires.txt 2015-02-23 14:39:12.013101917 -0800 |
17 @@ -6,20 +6,16 @@ |
20 @@ -1,5 +1,4 @@ |
18 PasteDeploy>=1.5.0 |
21 pbr>=0.6,!=0.7,<1.0 |
19 Routes>=1.12.3 |
22 -greenlet>=0.3.2 |
20 WebOb>=1.2.3,<1.3 |
23 SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6 |
21 -wsgiref>=0.1.2 |
24 anyjson>=0.3.3 |
22 boto>=2.4.0,!=2.13.0 |
25 eventlet>=0.15.1,<0.16.0 |
23 sqlalchemy-migrate>=0.7.2 |
26 @@ -7,11 +6,8 @@ PasteDeploy>=1.5.0 |
24 httplib2 |
27 Routes>=1.12.3,!=2.0 |
25 kombu>=2.4.8 |
28 WebOb>=1.2.3 |
|
29 argparse |
|
30 -boto>=2.32.1,<2.35.0 |
|
31 sqlalchemy-migrate==0.9.1 |
|
32 httplib2>=0.7.5 |
|
33 -kombu>=2.5.0 |
26 -pycrypto>=2.6 |
34 -pycrypto>=2.6 |
27 iso8601>=0.1.8 |
35 iso8601>=0.1.9 |
28 oslo.config>=1.2.0 |
36 ordereddict |
29 python-swiftclient>=1.5,<2.0.0 |
37 oslo.config>=1.4.0 # Apache-2.0 |
30 -lxml>=2.3 |
38 @@ -20,11 +16,8 @@ netaddr>=0.7.12 |
|
39 keystonemiddleware>=1.0.0 |
|
40 WSME>=0.6 |
|
41 posix_ipc |
|
42 -python-swiftclient>=2.2.0 |
|
43 -oslo.vmware>=0.6.0,<0.9.0 # Apache-2.0 |
31 Paste |
44 Paste |
32 -passlib |
45 jsonschema>=2.0.0,<3.0.0 |
33 jsonschema>=1.3.0,!=1.4.0 |
46 -python-cinderclient>=1.1.0 |
34 python-cinderclient>=1.0.6 |
47 python-keystoneclient>=0.10.0 |
35 python-keystoneclient>=0.3.2 |
|
36 pyOpenSSL>=0.11 |
48 pyOpenSSL>=0.11 |
37 -six>=1.4.1 |
49 six>=1.7.0 |
38 \ No newline at end of file |
50 --- glance-2014.2.2/requirements.txt.~1~ 2015-02-05 07:19:44.000000000 -0800 |
39 +six>=1.4.1 |
51 +++ glance-2014.2.2/requirements.txt 2015-02-23 14:39:03.037319077 -0800 |
40 --- glance-2013.2.3/requirements.txt.orig 2014-04-03 11:43:55.000000000 -0700 |
52 @@ -3,11 +3,6 @@ |
41 +++ glance-2013.2.3/requirements.txt 2014-05-24 23:05:14.053235541 -0700 |
53 # process, which may cause wedges in the gate later. |
42 @@ -12,29 +12,20 @@ |
54 |
43 PasteDeploy>=1.5.0 |
55 pbr>=0.6,!=0.7,<1.0 |
44 Routes>=1.12.3 |
56 -# |
45 WebOb>=1.2.3,<1.3 |
57 -# The greenlet package must be compiled with gcc and needs |
46 -wsgiref>=0.1.2 |
58 -# the Python.h headers. Make sure you install the python-dev |
|
59 -# package to get the right headers... |
|
60 -greenlet>=0.3.2 |
|
61 |
|
62 # < 0.8.0/0.8 does not work, see https://bugs.launchpad.net/bugs/1153983 |
|
63 SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6 |
|
64 @@ -17,11 +12,8 @@ PasteDeploy>=1.5.0 |
|
65 Routes>=1.12.3,!=2.0 |
|
66 WebOb>=1.2.3 |
47 argparse |
67 argparse |
48 boto>=2.4.0,!=2.13.0 |
68 -boto>=2.32.1,<2.35.0 |
49 sqlalchemy-migrate>=0.7.2 |
69 sqlalchemy-migrate==0.9.1 |
50 httplib2 |
70 httplib2>=0.7.5 |
51 kombu>=2.4.8 |
71 -kombu>=2.5.0 |
52 -pycrypto>=2.6 |
72 -pycrypto>=2.6 |
53 iso8601>=0.1.8 |
73 iso8601>=0.1.9 |
54 oslo.config>=1.2.0 |
74 ordereddict |
|
75 oslo.config>=1.4.0 # Apache-2.0 |
|
76 @@ -32,17 +24,10 @@ WSME>=0.6 |
|
77 # For openstack/common/lockutils |
|
78 posix_ipc |
55 |
79 |
56 # For Swift storage backend. |
80 -# For Swift storage backend. |
57 python-swiftclient>=1.5,<2.0.0 |
81 -python-swiftclient>=2.2.0 |
58 |
82 - |
59 -# Note you will need gcc buildtools installed and must |
83 -# For VMware storage backed. |
60 -# have installed libxml headers for lxml to be successfully |
84 -oslo.vmware>=0.6.0,<0.9.0 # Apache-2.0 |
61 -# installed using pip, therefore you will need to install the |
|
62 -# libxml2-dev and libxslt-dev Ubuntu packages. |
|
63 -lxml>=2.3 |
|
64 - |
85 - |
65 # For paste.util.template used in keystone.common.template |
86 # For paste.util.template used in keystone.common.template |
66 Paste |
87 Paste |
67 |
88 |
68 -passlib |
89 jsonschema>=2.0.0,<3.0.0 |
69 jsonschema>=1.3.0,!=1.4.0 |
90 -python-cinderclient>=1.1.0 |
70 python-cinderclient>=1.0.6 |
91 python-keystoneclient>=0.10.0 |
71 python-keystoneclient>=0.3.2 |
92 pyOpenSSL>=0.11 |
|
93 |