--- a/components/python/glanceclient/Makefile Wed Sep 07 14:48:36 2016 -0700
+++ b/components/python/glanceclient/Makefile Wed Sep 07 14:48:36 2016 -0700
@@ -26,16 +26,16 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= python-glanceclient
-COMPONENT_VERSION= 0.17.2
+COMPONENT_VERSION= 2.0.0
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:56ca8fe2c4f33d9dd9b045073bdd0dba09b1f6ef7af978175966d262678ecd0e
+ sha256:c4e791ef80e1b60997fa612e7f6ec506969bc6247b53d66988c2829c16b3617b
COMPONENT_ARCHIVE_URL= $(call pypi_url)
-COMPONENT_PROJECT_URL= http://launchpad.net/python-glanceclient
+COMPONENT_PROJECT_URL= http://docs.openstack.org/developer/python-glanceclient/
COMPONENT_BUGDB= service/glance
-TPNO= 25751
+TPNO= 29187
# Depends on keystoneclient & oslo.utils which are not Python 3 ready.
PYTHON_VERSIONS= $(PYTHON2_VERSIONS)
@@ -47,18 +47,15 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
COMPONENT_POST_INSTALL_ACTION = \
- (cd $(PROTO_DIR)/usr/bin ; $(MV) -f glance glance-$(PYTHON_VERSION))
+ (cd $(PROTO_DIR)/usr/bin ; $(MV) -f glance glance-$(PYTHON_VERSION))
# common targets
build: $(BUILD_NO_ARCH)
install: $(INSTALL_NO_ARCH)
-#
-# Tests require:
-# hacking, discover, mox, sphinx, testrepository, testtools
-# which haven't been integrated yet.
-#
+# 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/glanceclient/glanceclient-PYVER.p5m Wed Sep 07 14:48:36 2016 -0700
+++ b/components/python/glanceclient/glanceclient-PYVER.p5m Wed Sep 07 14:48:36 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -41,9 +41,9 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2014/007
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
link path=usr/bin/glance target=glance-$(PYVER) mediator=python \
mediator-version=$(PYVER)
-#
file path=usr/bin/glance-$(PYVER)
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/_i18n.py
@@ -72,15 +72,18 @@
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v1/image_members.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v1/images.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v1/shell.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v1/versions.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/client.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/image_members.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/image_schema.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/image_tags.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/images.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/metadefs.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/schemas.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/shell.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/tasks.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/versions.py
file path=usr/lib/python$(PYVER)/vendor-packages/python_glanceclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/python_glanceclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
file path=usr/lib/python$(PYVER)/vendor-packages/python_glanceclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
@@ -100,12 +103,6 @@
# to flush this out.
depend type=group fmri=library/python/simplejson-$(PYV)
-# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/argparse-$(PYV)
-
-# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/babel-$(PYV)
-
# force a dependency on the glanceclient package
depend type=require \
fmri=library/python/glanceclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/glanceclient/glanceclient.license Wed Sep 07 14:48:36 2016 -0700
+++ b/components/python/glanceclient/glanceclient.license Wed Sep 07 14:48:36 2016 -0700
@@ -8,7 +8,7 @@
See the License for the specific language governing permissions and limitations under the License.
- Apache License
+ Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -182,30 +182,3 @@
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--- a/components/python/glanceclient/patches/01-requirements.patch Wed Sep 07 14:48:36 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-In-house patch to remove the dependency on argparse. Since we use
-Python 2.7 only for OpenStack, argparse is already included. If this
-line is present, stevedore will fail to find the pip package for it,
-causing a cascade of failures to other tools.
-
---- python-glanceclient-0.17.2/requirements.txt.orig 2015-10-19 22:00:13.091897213 -0400
-+++ python-glanceclient-0.17.2/requirements.txt 2015-10-19 22:01:07.126301076 -0400
-@@ -3,7 +3,6 @@
- # process, which may cause wedges in the gate later.
- pbr!=0.7,<1.0,>=0.6
- Babel>=1.3
--argparse
- PrettyTable<0.8,>=0.7
- python-keystoneclient<1.4.0,>=1.2.0
- pyOpenSSL>=0.11
---- python-glanceclient-0.17.2/python_glanceclient.egg-info/requires.txt.orig 2015-10-19 22:00:38.507115182 -0400
-+++ python-glanceclient-0.17.2/python_glanceclient.egg-info/requires.txt 2015-10-19 22:00:51.990643082 -0400
-@@ -1,6 +1,5 @@
- pbr!=0.7,<1.0,>=0.6
- Babel>=1.3
--argparse
- PrettyTable<0.8,>=0.7
- python-keystoneclient<1.4.0,>=1.2.0
- pyOpenSSL>=0.11