--- a/components/python/openstackclient/Makefile Wed Sep 07 14:48:31 2016 -0700
+++ b/components/python/openstackclient/Makefile Wed Sep 07 14:48:31 2016 -0700
@@ -26,16 +26,17 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= python-openstackclient
-COMPONENT_VERSION= 1.0.4
+COMPONENT_VERSION= 2.3.0
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:4ae6d7b35fd1da2a07959fea9639e506871abfb769c62f3692d2f2585605ac85
+ sha256:5cd301fd11ed271175b2a656c0da4148332257b52d994891e61d3535870b4ca1
COMPONENT_ARCHIVE_URL= $(call pypi_url)
-COMPONENT_PROJECT_URL= http://launchpad.net/python-openstackclient
+COMPONENT_PROJECT_URL= \
+ http://docs.openstack.org/developer/python-openstackclient/
COMPONENT_BUGDB= python-mod/osclient
-TPNO= 24760
+TPNO= 28403
# Depends on keystoneclient which is not Python 3 ready.
PYTHON_VERSIONS= $(PYTHON2_VERSIONS)
@@ -47,8 +48,7 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
COMPONENT_POST_INSTALL_ACTION = \
- (cd $(PROTO_DIR)/usr/bin ; \
- $(MV) -f openstack openstack-$(PYTHON_VERSION))
+ (cd $(PROTO_DIR)/usr/bin ; $(MV) -f openstack openstack-$(PYTHON_VERSION))
# common targets
build: $(BUILD_NO_ARCH)
@@ -57,4 +57,4 @@
test: $(NO_TESTS)
-system-test: $(NO_TESTS)
+system-test: $(NO_TESTS)
--- a/components/python/openstackclient/openstackclient-PYVER.p5m Wed Sep 07 14:48:31 2016 -0700
+++ b/components/python/openstackclient/openstackclient-PYVER.p5m Wed Sep 07 14:48:31 2016 -0700
@@ -51,18 +51,22 @@
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/api/auth_plugin.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/api/image_v1.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/api/image_v2.py
-file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/api/network_v2.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/api/object_store_v1.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/api/utils.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/common/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/common/availability_zone.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/common/clientmanager.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/common/command.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/common/commandmanager.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/common/configuration.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/common/exceptions.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/common/extension.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/common/limits.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/common/logs.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/common/module.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/common/parseractions.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/common/quota.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/common/session.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/common/timing.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/common/utils.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/compute/__init__.py
@@ -70,7 +74,6 @@
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/compute/v2/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/compute/v2/agent.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/compute/v2/aggregate.py
-file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/compute/v2/availability_zone.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/compute/v2/console.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/compute/v2/fixedip.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/compute/v2/flavor.py
@@ -102,6 +105,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/identity/v3/consumer.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/identity/v3/credential.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/identity/v3/domain.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/identity/v3/ec2creds.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/identity/v3/endpoint.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/identity/v3/federation_protocol.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/identity/v3/group.py
@@ -113,6 +117,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/identity/v3/role.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/identity/v3/role_assignment.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/identity/v3/service.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/identity/v3/service_provider.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/identity/v3/token.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/identity/v3/trust.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/identity/v3/unscoped_saml.py
@@ -127,21 +132,35 @@
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/network/client.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/network/common.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/network/v2/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/network/v2/floating_ip.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/network/v2/network.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/network/v2/port.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/network/v2/router.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/network/v2/security_group.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/network/v2/security_group_rule.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/network/v2/subnet.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/network/v2/subnet_pool.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/object/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/object/client.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/object/v1/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/object/v1/account.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/object/v1/container.py
-file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/object/v1/lib/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/object/v1/object.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/shell.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/volume/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/volume/client.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/volume/v1/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/volume/v1/backup.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/volume/v1/qos_specs.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/volume/v1/snapshot.py
-file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/volume/v1/type.py
file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/volume/v1/volume.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/volume/v1/volume_type.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/volume/v2/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/volume/v2/backup.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/volume/v2/qos_specs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/volume/v2/snapshot.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/volume/v2/volume.py
+file path=usr/lib/python$(PYVER)/vendor-packages/openstackclient/volume/v2/volume_type.py
file path=usr/lib/python$(PYVER)/vendor-packages/python_openstackclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/python_openstackclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
file path=usr/lib/python$(PYVER)/vendor-packages/python_openstackclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
@@ -153,20 +172,24 @@
#
license openstackclient.license license="Apache v2.0"
-# force a dependency on cinderclient; pkgdepend work is needed to flush this out.
+# force a dependency on cinderclient; pkgdepend work is needed to flush this
+# out.
depend type=require fmri=library/python/cinderclient-$(PYV)
# force a dependency on cliff; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/cliff-$(PYV)
-# force a dependency on glanceclient; pkgdepend work is needed to flush this out.
+# force a dependency on glanceclient; pkgdepend work is needed to flush this
+# out.
depend type=require fmri=library/python/glanceclient-$(PYV)
-# force a dependency on keystoneclient; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/keystoneclient-$(PYV)
+# force a dependency on keystoneauth1; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/keystoneauth1-$(PYV)
-# force a dependency on neutronclient; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/neutronclient-$(PYV)
+# force a dependency on keystoneclient; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/keystoneclient-$(PYV)
# force a dependency on novaclient; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/novaclient-$(PYV)
@@ -175,6 +198,14 @@
depend type=require \
fmri=library/python/openstackclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+# force a dependency on openstacksdk; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/openstacksdk-$(PYV)
+
+# force a dependency on os-client-config; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/os-client-config-$(PYV)
+
# force a dependency on oslo.config; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oslo.config-$(PYV)
@@ -190,6 +221,12 @@
# force a dependency on requests; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/requests-$(PYV)
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/setuptools-$(PYV)
+
+# force a dependency on simplejson; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/simplejson-$(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/openstackclient/openstackclient.license Wed Sep 07 14:48:31 2016 -0700
+++ b/components/python/openstackclient/openstackclient.license Wed Sep 07 14:48:31 2016 -0700
@@ -183,30 +183,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/openstackclient/patches/01-requirements.patch Wed Sep 07 14:48:31 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-In house patch to modify dependencies openstackclient's requirements files.
-The specific reasons are as follows:
-
- cliff-tablib: Not applicable
- python-cinderclient: push to version 1.3.1
-
---- python-openstackclient-1.0.4/requirements.txt.orig 2015-11-19 12:56:09.037137656 -0700
-+++ python-openstackclient-1.0.4/requirements.txt 2015-11-19 12:51:38.972729254 -0700
-@@ -6,7 +6,6 @@ six>=1.9.0
-
- Babel>=1.3
- cliff>=1.10.0,<1.11.0 # Apache-2.0
--cliff-tablib>=1.0
- oslo.config>=1.9.3,<1.10.0 # Apache-2.0
- oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0
- oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
-@@ -14,7 +13,7 @@ oslo.serialization>=1.4.0,<1.5.0
- python-glanceclient>=0.15.0,<0.18.0
- python-keystoneclient>=1.1.0,<1.4.0
- python-novaclient>=2.22.0,<2.24.0
--python-cinderclient>=1.1.0,<1.2.0
-+python-cinderclient>=1.1.0,<=1.3.1
- python-neutronclient>=2.3.11,<2.5.0
- requests>=2.2.0,!=2.4.0
- stevedore>=1.3.0,<1.4.0 # Apache-2.0
-
---- python-openstackclient-1.0.4/python_openstackclient.egg-info/requires.txt.orig 2015-11-19 12:56:59.337766773 -0700
-+++ python-openstackclient-1.0.4/python_openstackclient.egg-info/requires.txt 2015-11-19 12:57:13.594181649 -0700
-@@ -2,7 +2,6 @@ pbr>=0.6,!=0.7,<1.0
- six>=1.9.0
- Babel>=1.3
- cliff>=1.10.0,<1.11.0 # Apache-2.0
--cliff-tablib>=1.0
- oslo.config>=1.9.3,<1.10.0 # Apache-2.0
- oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0
- oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
-@@ -10,7 +9,7 @@ oslo.serialization>=1.4.0,<1.5.0
- python-glanceclient>=0.15.0,<0.18.0
- python-keystoneclient>=1.1.0,<1.4.0
- python-novaclient>=2.22.0,<2.24.0
--python-cinderclient>=1.1.0,<1.2.0
-+python-cinderclient>=1.1.0,<=1.3.1
- python-neutronclient>=2.3.11,<2.5.0
- requests>=2.2.0,!=2.4.0
- stevedore>=1.3.0,<1.4.0 # Apache-2.0
-