Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
23119353 Upgrade python-swiftclient to 3.0.0
authorLaszlo Peter <laszlo.peter@oracle.com>
Wed, 07 Sep 2016 14:48:38 -0700
changeset 6831 6dc24fe2c2de
parent 6830 d33ee3b41806
child 6832 ddc052de3d12
23119353 Upgrade python-swiftclient to 3.0.0
components/python/swiftclient/Makefile file | annotate | diff | comparison | revisions
components/python/swiftclient/swiftclient-GENFRAG.p5m file | annotate | diff | comparison | revisions
components/python/swiftclient/swiftclient-PYVER.p5m file | annotate | diff | comparison | revisions 
--- a/components/python/swiftclient/Makefile	Wed Sep 07 14:48:37 2016 -0700
+++ b/components/python/swiftclient/Makefile	Wed Sep 07 14:48:38 2016 -0700
@@ -22,21 +22,22 @@
 #
 # Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
+
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		python-swiftclient
-COMPONENT_VERSION=	2.4.0
+COMPONENT_VERSION=	3.0.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:e865553b3afc63a9952cfa30f155a604564cae31a40275fa2ce94c80d7affd4b
+    sha256:824b8f204c5a7764de51795256e4175fdcd655ae4df85b8ae6e6ea9ec0b41f68
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
-COMPONENT_PROJECT_URL=	http://launchpad.net/python-swiftclient
+COMPONENT_PROJECT_URL=	http://docs.openstack.org/developer/python-swiftclient/
 COMPONENT_BUGDB=	service/swift
 
-TPNO=			25758
+TPNO=			29374
 
-# depends on keystoneclient which is not Python 3 ready
+# Depends on keystoneclient which is not Python 3 ready
 PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
 
 include $(WS_MAKE_RULES)/prep.mk
@@ -46,18 +47,15 @@
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 COMPONENT_POST_INSTALL_ACTION = \
-	(cd $(PROTO_DIR)/usr/bin ; $(MV) -f swift swift-$(PYTHON_VERSION))
+    (cd $(PROTO_DIR)/usr/bin ; $(MV) -f swift swift-$(PYTHON_VERSION))
 
 # common targets
 build:		$(BUILD_NO_ARCH)
 
 install:	$(INSTALL_NO_ARCH)
 
-#
-# Tests require:
-# discover, 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/swiftclient/swiftclient-GENFRAG.p5m	Wed Sep 07 14:48:37 2016 -0700
+++ b/components/python/swiftclient/swiftclient-GENFRAG.p5m	Wed Sep 07 14:48:38 2016 -0700
@@ -25,4 +25,4 @@
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 file doc/manpages/swift.1 path=usr/share/man/man1/swift.1
-license LICENSE license="Apache v2.0"
+license swiftclient.license license="Apache v2.0"
--- a/components/python/swiftclient/swiftclient-PYVER.p5m	Wed Sep 07 14:48:37 2016 -0700
+++ b/components/python/swiftclient/swiftclient-PYVER.p5m	Wed Sep 07 14:48:38 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 \
@@ -50,6 +50,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/python_swiftclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/python_swiftclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/python_swiftclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/python_swiftclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
 file path=usr/lib/python$(PYVER)/vendor-packages/python_swiftclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/python_swiftclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/swiftclient/__init__.py
@@ -58,7 +59,8 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/swiftclient/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swiftclient/multithreading.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swiftclient/service.py
-file path=usr/lib/python$(PYVER)/vendor-packages/swiftclient/shell.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swiftclient/shell.py \
+    pkg.depend.bypass-generate=.*/six.*
 file path=usr/lib/python$(PYVER)/vendor-packages/swiftclient/utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swiftclient/version.py
 #
@@ -68,10 +70,6 @@
 # needed to flush this out.
 depend type=group fmri=library/python/keystoneclient-$(PYV)
 
-# force a group dependency on the optional simplejson; pkgdepend work is needed
-# to flush this out.
-depend type=group fmri=library/python/simplejson-$(PYV)
-
 # force a dependency on futures; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/futures-$(PYV)
upstream/oracle/userland-gate