23093738 Upgrade cliff to 2.0.0
authorLaszlo Peter <laszlo.peter@oracle.com>
Wed, 07 Sep 2016 14:48:27 -0700
changeset 6778 2d8467c6aa45
parent 6777 92de91c5ac57
child 6779 bf5dfa70d3b9
23093738 Upgrade cliff to 2.0.0
components/python/cliff/Makefile
components/python/cliff/cliff-PYVER.p5m
components/python/cliff/patches/01-requirements.patch
--- a/components/python/cliff/Makefile	Wed Sep 07 14:48:27 2016 -0700
+++ b/components/python/cliff/Makefile	Wed Sep 07 14:48:27 2016 -0700
@@ -26,16 +26,16 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		cliff
-COMPONENT_VERSION=	1.10.1
+COMPONENT_VERSION=	2.0.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:ddfec39bf0de7b53666045c946d495ca070e538e5f92dc19588596c9bcc52c6e
+    sha256:6e219dc3ed80a23e3dc5c88b741f3997b8450581c1d2572bde14b2dfa556d782
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
-COMPONENT_PROJECT_URL=	https://pypi.python.org/pypi/cliff
+COMPONENT_PROJECT_URL=	http://docs.openstack.org/developer/cliff/
 COMPONENT_BUGDB=	python-mod/cliff
 
-TPNO=			25733
+TPNO=			27989
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
@@ -48,9 +48,8 @@
 
 install:	$(INSTALL_NO_ARCH)
 
-# Tests require:
-# coverage >= 3.6, sphinx, oslosphinx
-# some of 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/cliff/cliff-PYVER.p5m	Wed Sep 07 14:48:27 2016 -0700
+++ b/components/python/cliff/cliff-PYVER.p5m	Wed Sep 07 14:48:27 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -48,6 +48,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/app.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cliff/argparse.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/command.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/commandmanager.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/complete.py
@@ -55,20 +56,19 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/formatters/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/formatters/base.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/formatters/commaseparated.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cliff/formatters/json_format.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/formatters/shell.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/formatters/table.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/formatters/value.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cliff/formatters/yaml_format.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/help.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/interactive.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/lister.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/show.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cliff/utils.py
 #
 license cliff.license license="Apache v2.0, MIT"
 
-# force a group dependency on the optional prettytable; pkgdepend work is needed
-# to flush this out.
-depend type=group fmri=library/python/prettytable-$(PYV)
-
 # force the rename with an optional dependency on the old name
 depend type=optional \
     fmri=library/python-2/cliff-$(PYV)@1.4.5,5.12-5.12.0.0.0.41.0
@@ -77,9 +77,6 @@
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
-# 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 the cliff package
 depend type=require \
     fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -87,11 +84,11 @@
 # force a dependency on cmd2; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/cmd2-$(PYV)
 
-# force a dependency on pbr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/pbr-$(PYV)
+# 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 pyparsing; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/pyparsing-$(PYV)
+# force a dependency on pyyaml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pyyaml-$(PYV)
 
 # force a dependency on setuptools; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/setuptools-$(PYV)
@@ -101,3 +98,6 @@
 
 # force a dependency on stevedore; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/stevedore-$(PYV)
+
+# force a dependency on unicodecsv; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/unicodecsv-$(PYV)
--- a/components/python/cliff/patches/01-requirements.patch	Wed Sep 07 14:48:27 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.
-
---- cliff-1.10.1/requirements.txt.orig	2015-03-09 09:58:33.000000000 -0400
-+++ cliff-1.10.1/requirements.txt	2015-08-02 16:28:21.450926314 -0400
[email protected]@ -2,7 +2,6 @@
- # of appearance. Changing the order has an impact on the overall integration
- # process, which may cause wedges in the gate later.
- pbr>=0.6,!=0.7,<1.0
--argparse
- cmd2>=0.6.7
- PrettyTable>=0.7,<0.8
- pyparsing>=2.0.1
-
---- cliff-1.10.1/cliff.egg-info/requires.txt.orig	2015-03-09 09:58:50.000000000 -0400
-+++ cliff-1.10.1/cliff.egg-info/requires.txt	2015-08-02 16:28:21.451475905 -0400
[email protected]@ -1,5 +1,4 @@
- pbr>=0.6,!=0.7,<1.0
--argparse
- cmd2>=0.6.7
- PrettyTable>=0.7,<0.8
- pyparsing>=2.0.1