# HG changeset patch # User Laszlo Peter # Date 1473284917 25200 # Node ID d33ee3b41806c828dd078c33caf78b15b5877e80 # Parent ba8d48abe5da7aaa521cfdfc55d08bcfda618fa7 23209219 Upgrade saharaclient to 0.14.0 diff -r ba8d48abe5da -r d33ee3b41806 components/python/saharaclient/Makefile --- a/components/python/saharaclient/Makefile Wed Sep 07 14:48:37 2016 -0700 +++ b/components/python/saharaclient/Makefile Wed Sep 07 14:48:37 2016 -0700 @@ -26,16 +26,16 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME= python-saharaclient -COMPONENT_VERSION= 0.8.0 +COMPONENT_VERSION= 0.14.0 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:cd212b85811118eb45ab5b2ade0a8cbf5418d5d6b9f4e7425b5026c293effb39 + sha256:57ff9c9cc5215ae59120f43d955a3b2c55cede9b3288bc7275d6e2831876c771 COMPONENT_ARCHIVE_URL= $(call pypi_url) -COMPONENT_PROJECT_URL= http://launchpad.net/python-saharaclient +COMPONENT_PROJECT_URL= http://docs.openstack.org/developer/python-saharaclient/ COMPONENT_BUGDB= service/sahara -TPNO= 25757 +TPNO= 29175 # Depends on keystoneclient which is not Python 3 ready. PYTHON_VERSIONS= $(PYTHON2_VERSIONS) @@ -47,15 +47,15 @@ ASLR_MODE = $(ASLR_NOT_APPLICABLE) COMPONENT_POST_INSTALL_ACTION = \ - (cd $(PROTO_DIR)/usr/bin ; $(MV) -f sahara sahara-$(PYTHON_VERSION)) + (cd $(PROTO_DIR)/usr/bin ; $(MV) -f sahara sahara-$(PYTHON_VERSION)) # common targets build: $(BUILD_NO_ARCH) 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) diff -r ba8d48abe5da -r d33ee3b41806 components/python/saharaclient/patches/01-requirements.patch --- a/components/python/saharaclient/patches/01-requirements.patch Wed Sep 07 14:48:37 2016 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +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-saharaclient-0.8.0/requirements.txt.orig 2015-08-02 02:14:21.878516359 -0400 -+++ python-saharaclient-0.8.0/requirements.txt 2015-08-02 02:15:04.434964849 -0400 -@@ -12,4 +12,3 @@ - requests>=2.2.0,!=2.4.0 - six>=1.7.0 - PrettyTable>=0.7,<0.8 --argparse - ---- python-saharaclient-0.8.0/python_saharaclient.egg-info/requires.txt.orig 2015-08-02 17:17:40.108351859 -0400 -+++ python-saharaclient-0.8.0/python_saharaclient.egg-info/requires.txt 2015-08-02 02:14:48.979346364 -0400 -@@ -7,4 +7,3 @@ - requests>=2.2.0,!=2.4.0 - six>=1.7.0 - PrettyTable>=0.7,<0.8 --argparse diff -r ba8d48abe5da -r d33ee3b41806 components/python/saharaclient/saharaclient-PYVER.p5m --- a/components/python/saharaclient/saharaclient-PYVER.p5m Wed Sep 07 14:48:37 2016 -0700 +++ b/components/python/saharaclient/saharaclient-PYVER.p5m Wed Sep 07 14:48:37 2016 -0700 @@ -60,13 +60,12 @@ file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/cluster_templates.py file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/clusters.py file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/data_sources.py -file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/events.py file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/helpers.py -file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/httpclient.py file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/images.py file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/job_binaries.py file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/job_binary_internals.py file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/job_executions.py +file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/job_types.py file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/jobs.py file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/node_group_templates.py file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/parameters.py @@ -80,20 +79,50 @@ file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/openstack/common/apiclient/auth.py file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/openstack/common/apiclient/exceptions.py file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/openstack/common/cliutils.py +file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/osc/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/osc/plugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/osc/v1/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/osc/v1/cluster_templates.py +file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/osc/v1/clusters.py +file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/osc/v1/data_sources.py +file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/osc/v1/images.py +file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/osc/v1/job_binaries.py +file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/osc/v1/job_templates.py +file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/osc/v1/job_types.py +file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/osc/v1/jobs.py +file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/osc/v1/node_group_templates.py +file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/osc/v1/plugins.py +file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/osc/v1/utils.py file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/shell.py file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/version.py # license saharaclient.license license="Apache v2.0" -# force a dependency on argparse; pkgdepend work is needed to flush this out. -depend type=require fmri=library/python/argparse-$(PYV) +# force a group dependency on the optional oslo.i18n; pkgdepend work is needed +# to flush this out. +depend type=group fmri=library/python/oslo.i18n-$(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 keystoneauth1; pkgdepend work is needed to flush this +# out. +depend type=require fmri=library/python/keystoneauth1-$(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 oslo.i18n; pkgdepend work is needed to flush this out. -depend type=require fmri=library/python/oslo.i18n-$(PYV) +# force a dependency on openstackclient; pkgdepend work is needed to flush this +# out. +depend type=require fmri=library/python/openstackclient-$(PYV) + +# force a dependency on oslo.log; pkgdepend work is needed to flush this out. +depend type=require fmri=library/python/oslo.log-$(PYV) + +# force a dependency on oslo.serialization; pkgdepend work is needed to flush +# this out. +depend type=require fmri=library/python/oslo.serialization-$(PYV) # force a dependency on oslo.utils; pkgdepend work is needed to flush this out. depend type=require fmri=library/python/oslo.utils-$(PYV) @@ -104,9 +133,6 @@ # force a dependency on prettytable; pkgdepend work is needed to flush this out. depend type=require fmri=library/python/prettytable-$(PYV) -# 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 the saharaclient package depend type=require \ fmri=library/python/saharaclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) diff -r ba8d48abe5da -r d33ee3b41806 components/python/saharaclient/saharaclient.license --- a/components/python/saharaclient/saharaclient.license Wed Sep 07 14:48:37 2016 -0700 +++ b/components/python/saharaclient/saharaclient.license Wed Sep 07 14:48:37 2016 -0700 @@ -8,7 +8,8 @@ See the License for the specific language governing permissions and limitations under the License. - Apache License + The following attribution text was taken from Component python-saharaclient Version 0.14.0 + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -182,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.