Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openstack/glance/patches/04-requirements.patch
changeset 5405 66fd59fecd68
parent 3998 5bd484384122
child 6852 bf55de364b19 
--- a/components/openstack/glance/patches/04-requirements.patch	Fri Feb 05 11:09:10 2016 -0800
+++ b/components/openstack/glance/patches/04-requirements.patch	Fri Feb 05 17:54:17 2016 -0500
@@ -1,93 +1,91 @@
 In-house patch to remove unnecessary dependencies from Glance's
 requirements files. The specific reasons are as follows:
 
-boto		Not applicable
+anyjson			Not applicable
 
-cinderclient	Not applicable
+iso8601			Not applicable
 
-greenlet	Not applicable
+kombu			Not applicable
 
-kombu		Not applicable
+oslo.vmware		Not applicable
 
-oslo.vmware	Not applicable
+posix-ipc		Not applicable
 
-pycrypto	Not applicable to Solaris (M2Crypto used instead)
+pycrypto		Not applicable to Solaris (M2Crypto used instead)
 
-swiftclient	Not applicable
+python-keystoneclient	Not applicable
 
---- glance-2014.2.2/glance.egg-info/requires.txt.~1~	2015-02-05 07:21:46.000000000 -0800
-+++ glance-2014.2.2/glance.egg-info/requires.txt	2015-02-23 14:39:12.013101917 -0800
-@@ -1,5 +1,4 @@
- pbr>=0.6,!=0.7,<1.0
--greenlet>=0.3.2
- 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
- anyjson>=0.3.3
- eventlet>=0.15.1,<0.16.0
-@@ -7,11 +6,8 @@ PasteDeploy>=1.5.0
- Routes>=1.12.3,!=2.0
+python-swiftclient	Not applicable
+
+--- glance-2015.1.2/glance.egg-info/requires.txt.~1~	2015-10-13 09:41:01.000000000 -0700
++++ glance-2015.1.2/glance.egg-info/requires.txt	2016-01-24 20:34:20.750596736 -0800
+@@ -1,16 +1,12 @@
+ pbr!=0.7,<1.0,>=0.6
+ greenlet>=0.3.2
+ SQLAlchemy<=0.9.99,>=0.9.7
+-anyjson>=0.3.3
+ eventlet!=0.17.0,>=0.16.1
+ PasteDeploy>=1.5.0
+ Routes!=2.0,>=1.12.3
  WebOb>=1.2.3
- argparse
--boto>=2.32.1,<2.35.0
- sqlalchemy-migrate==0.9.1
+ sqlalchemy-migrate!=0.9.8,<0.10.0,>=0.9.5
  httplib2>=0.7.5
 -kombu>=2.5.0
 -pycrypto>=2.6
- iso8601>=0.1.9
- ordereddict
- oslo.config>=1.4.0  # Apache-2.0
-@@ -20,11 +16,8 @@ netaddr>=0.7.12
- keystonemiddleware>=1.0.0
- WSME>=0.6
- posix_ipc
--python-swiftclient>=2.2.0
--oslo.vmware>=0.6.0,<0.9.0               # Apache-2.0
+-iso8601>=0.1.9
+ oslo.config<1.10.0,>=1.9.3 # Apache-2.0
+ oslo.concurrency<1.9.0,>=1.8.2 # Apache-2.0
+ oslo.context<0.3.0,>=0.2.0 # Apache-2.0
+@@ -19,12 +15,8 @@ stevedore<1.4.0,>=1.3.0 # Apache-2.0
+ taskflow<0.8.0,>=0.7.1
+ keystonemiddleware<1.6.0,>=1.5.0
+ WSME<0.7,>=0.6
+-posix-ipc
+-python-swiftclient<2.5.0,>=2.2.0
+-oslo.vmware<0.12.0,>=0.11.1 # Apache-2.0
  Paste
- jsonschema>=2.0.0,<3.0.0
--python-cinderclient>=1.1.0
- python-keystoneclient>=0.10.0
+ jsonschema<3.0.0,>=2.0.0
+-python-keystoneclient<1.4.0,>=1.2.0
  pyOpenSSL>=0.11
- six>=1.7.0
---- glance-2014.2.2/requirements.txt.~1~	2015-02-05 07:19:44.000000000 -0800
-+++ glance-2014.2.2/requirements.txt	2015-02-23 14:39:03.037319077 -0800
-@@ -3,11 +3,6 @@
- # process, which may cause wedges in the gate later.
- 
- pbr>=0.6,!=0.7,<1.0
--#
--# The greenlet package must be compiled with gcc and needs
--# the Python.h headers. Make sure you install the python-dev
--# package to get the right headers...
--greenlet>=0.3.2
+ six>=1.9.0
+ oslo.db<1.8.0,>=1.7.0 # Apache-2.0
+--- glance-2015.1.2/requirements.txt.~1~	2015-10-13 09:38:23.000000000 -0700
++++ glance-2015.1.2/requirements.txt	2016-01-24 20:43:04.064101395 -0800
+@@ -11,16 +11,12 @@ greenlet>=0.3.2
  
  # < 0.8.0/0.8 does not work, see https://bugs.launchpad.net/bugs/1153983
- 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
-@@ -17,11 +12,8 @@ PasteDeploy>=1.5.0
- Routes>=1.12.3,!=2.0
+ SQLAlchemy<=0.9.99,>=0.9.7
+-anyjson>=0.3.3
+ eventlet!=0.17.0,>=0.16.1
+ PasteDeploy>=1.5.0
+ Routes!=2.0,>=1.12.3
  WebOb>=1.2.3
- argparse
--boto>=2.32.1,<2.35.0
- sqlalchemy-migrate==0.9.1
+ sqlalchemy-migrate!=0.9.8,<0.10.0,>=0.9.5
  httplib2>=0.7.5
 -kombu>=2.5.0
 -pycrypto>=2.6
- iso8601>=0.1.9
- ordereddict
- oslo.config>=1.4.0  # Apache-2.0
-@@ -32,17 +24,10 @@ WSME>=0.6
- # For openstack/common/lockutils
- posix_ipc
- 
+-iso8601>=0.1.9
+ oslo.config<1.10.0,>=1.9.3 # Apache-2.0
+ oslo.concurrency<1.9.0,>=1.8.2 # Apache-2.0
+ oslo.context<0.3.0,>=0.2.0 # Apache-2.0
+@@ -29,20 +25,11 @@ stevedore<1.4.0,>=1.3.0 # Apache-2.0
+ taskflow<0.8.0,>=0.7.1
+ keystonemiddleware<1.6.0,>=1.5.0
+ WSME<0.7,>=0.6
+-# For openstack/common/lockutils
+-posix-ipc
+-
 -# For Swift storage backend.
--python-swiftclient>=2.2.0
+-python-swiftclient<2.5.0,>=2.2.0
 -
 -# For VMware storage backed.
--oslo.vmware>=0.6.0,<0.9.0               # Apache-2.0
--
+-oslo.vmware<0.12.0,>=0.11.1 # Apache-2.0
+ 
  # For paste.util.template used in keystone.common.template
  Paste
  
- jsonschema>=2.0.0,<3.0.0
--python-cinderclient>=1.1.0
- python-keystoneclient>=0.10.0
+ jsonschema<3.0.0,>=2.0.0
+-python-keystoneclient<1.4.0,>=1.2.0
  pyOpenSSL>=0.11
- 
+ # Required by openstack.common libraries
+ six>=1.9.0
upstream/oracle/userland-gate