--- a/components/python/glance_store/Makefile Wed Sep 07 14:48:29 2016 -0700
+++ b/components/python/glance_store/Makefile Wed Sep 07 14:48:29 2016 -0700
@@ -26,16 +26,16 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= glance_store
-COMPONENT_VERSION= 0.4.0
+COMPONENT_VERSION= 0.13.0
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:cd15e9f9a08dc8d3eeaa452682c8e53423f848eaadf064c0ee8068583aa31154
+ sha256:f3d6ca8f66a290cc31e1420ef9645ed69b36318cfcf86e50c51cbc811dfc8cc3
COMPONENT_ARCHIVE_URL= $(call pypi_url)
-COMPONENT_PROJECT_URL= https://github.com/openstack/glance_store
+COMPONENT_PROJECT_URL= http://docs.openstack.org/developer/glance_store/
COMPONENT_BUGDB= python-mod/glance_store
-TPNO= 25736
+TPNO= 27998
# Depends on oslo.vmware which is not Python 3 ready.
PYTHON_VERSIONS= $(PYTHON2_VERSIONS)
@@ -51,8 +51,8 @@
install: $(INSTALL_NO_ARCH)
-# see $(COMPONENT_SRC)/test-requirements.txt for the python modules
+# See $(COMPONENT_SRC)/test-requirements.txt for the Python modules
# required to execute unittests.
test: $(NO_TESTS)
-system-test: $(NO_TESTS)
+system-test: $(NO_TESTS)
--- a/components/python/glance_store/glance_store-PYVER.p5m Wed Sep 07 14:48:29 2016 -0700
+++ b/components/python/glance_store/glance_store-PYVER.p5m Wed Sep 07 14:48:29 2016 -0700
@@ -53,29 +53,22 @@
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/_drivers/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/_drivers/cinder.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/_drivers/filesystem.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/_drivers/gridfs.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/_drivers/http.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/_drivers/rbd.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/_drivers/s3.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/_drivers/sheepdog.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/_drivers/swift/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/_drivers/swift/connection_manager.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/_drivers/swift/store.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/_drivers/swift/utils.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/_drivers/vmware_datastore.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/backend.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/capabilities.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/common/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/common/auth.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/common/config.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/common/utils.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/driver.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/exceptions.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/i18n.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/locale/glance_store-log-critical.pot
-file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/locale/glance_store-log-error.pot
-file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/locale/glance_store-log-info.pot
-file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/locale/glance_store-log-warning.pot
-file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/locale/glance_store.pot
file path=usr/lib/python$(PYVER)/vendor-packages/glance_store/location.py
#
license glance_store.license license="Apache v2.0"
@@ -88,10 +81,18 @@
# needed to flush this out.
depend type=group fmri=library/python/cinderclient-$(PYV)
+# force a group dependency on the optional keystoneclient; pkgdepend work is
+# needed to flush this out.
+depend type=group fmri=library/python/keystoneclient-$(PYV)
+
# force a group dependency on the optional oslo.vmware; pkgdepend work is needed
# to flush this out.
depend type=group fmri=library/python/oslo.vmware-$(PYV)
+# force a group dependency on the optional requests; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python/requests-$(PYV)
+
# force a group dependency on the optional swiftclient; pkgdepend work is needed
# to flush this out.
depend type=group fmri=library/python/swiftclient-$(PYV)
@@ -110,16 +111,11 @@
depend type=require \
fmri=library/python/glance_store@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-# force a dependency on httplib2; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/httplib2-$(PYV)
-
# force a dependency on jsonschema; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/jsonschema-$(PYV)
-# force a dependency on ordereddict; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/ordereddict-$(PYV)
-
-# force a dependency on oslo.concurrency; pkgdepend work is needed to flush this out.
+# force a dependency on oslo.concurrency; pkgdepend work is needed to flush this
+# out.
depend type=require fmri=library/python/oslo.concurrency-$(PYV)
# force a dependency on oslo.config; pkgdepend work is needed to flush this out.
@@ -135,10 +131,6 @@
# force a dependency on oslo.utils; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oslo.utils-$(PYV)
-# force a dependency on paste.deploy; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python/paste.deploy-$(PYV)
-
# force a dependency on six; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/six-$(PYV)
--- a/components/python/glance_store/patches/no-tests.patch Wed Sep 07 14:48:29 2016 -0700
+++ b/components/python/glance_store/patches/no-tests.patch Wed Sep 07 14:48:29 2016 -0700
@@ -3,11 +3,11 @@
is printed in some of the Glance service logs. Not suitable for the
upstream.
---- glance_store-0.4.0/setup.cfg.orig 2014-11-17 12:15:39.000000000 -0800
-+++ glance_store-0.4.0/setup.cfg 2015-01-27 09:38:35.386243430 -0800
+--- glance_store-0.13.0/setup.cfg.~1~ 2016-03-03 07:33:51.000000000 +0000
++++ glance_store-0.13.0/setup.cfg 2016-09-06 17:03:27.304396117 +0000
@@ -33,8 +33,6 @@ glance_store.drivers =
+ sheepdog = glance_store._drivers.sheepdog:Store
cinder = glance_store._drivers.cinder:Store
- gridfs = glance_store._drivers.gridfs:Store
vmware = glance_store._drivers.vmware_datastore:Store
- # TESTS ONLY
- no_conf = glance_store.tests.fakes:UnconfigurableStore