23206205 Upgrade boto to 2.40.0
authorLaszlo Peter <laszlo.peter@oracle.com>
Wed, 07 Sep 2016 14:48:27 -0700
changeset 6777 92de91c5ac57
parent 6776 309f62bc7c22
child 6778 2d8467c6aa45
23206205 Upgrade boto to 2.40.0
components/python/boto/Makefile
components/python/boto/boto-PYVER.p5m
--- a/components/python/boto/Makefile	Wed Sep 07 14:48:27 2016 -0700
+++ b/components/python/boto/Makefile	Wed Sep 07 14:48:27 2016 -0700
@@ -20,22 +20,22 @@
 #
 
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		boto
-COMPONENT_VERSION=	2.34.0
+COMPONENT_VERSION=	2.40.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:33baab022ecb803414ad0d6cf4041d010cfc2755ff8acc3bea7b32e77ba98be0
+    sha256:e12d5fca11fcabfd0acd18f78651e0f0dba60f958a0520ff4e9b73e35cd9928f
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	http://github.com/boto/boto/
 COMPONENT_BUGDB=	python-mod/boto
 
-TPNO=			21716
+TPNO=			29473
 
 # Syntax issues: not Python 3 ready.
 PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
@@ -47,28 +47,28 @@
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 COMPONENT_POST_INSTALL_ACTION= \
-	(cd $(PROTO_DIR)/usr/demo/$(COMPONENT_NAME) ; \
-	 $(MV) -f asadmin asadmin-$(PYTHON_VERSION) ; \
-	 $(MV) -f bundle_image bundle_image-$(PYTHON_VERSION) ; \
-	 $(MV) -f cfadmin cfadmin-$(PYTHON_VERSION) ; \
-	 $(MV) -f cq cq-$(PYTHON_VERSION) ; \
-	 $(MV) -f cwutil cwutil-$(PYTHON_VERSION) ; \
-	 $(MV) -f dynamodb_dump dynamodb_dump-$(PYTHON_VERSION) ; \
-	 $(MV) -f dynamodb_load dynamodb_load-$(PYTHON_VERSION) ; \
-	 $(MV) -f elbadmin elbadmin-$(PYTHON_VERSION) ; \
-	 $(MV) -f fetch_file fetch_file-$(PYTHON_VERSION) ; \
-	 $(MV) -f glacier glacier-$(PYTHON_VERSION) ; \
-	 $(MV) -f instance_events instance_events-$(PYTHON_VERSION) ; \
-	 $(MV) -f kill_instance kill_instance-$(PYTHON_VERSION) ; \
-	 $(MV) -f launch_instance launch_instance-$(PYTHON_VERSION) ; \
-	 $(MV) -f list_instances list_instances-$(PYTHON_VERSION) ; \
-	 $(MV) -f lss3 lss3-$(PYTHON_VERSION) ; \
-	 $(MV) -f mturk mturk-$(PYTHON_VERSION) ; \
-	 $(MV) -f pyami_sendmail pyami_sendmail-$(PYTHON_VERSION) ; \
-	 $(MV) -f route53 route53-$(PYTHON_VERSION) ; \
-	 $(MV) -f s3put s3put-$(PYTHON_VERSION) ; \
-	 $(MV) -f sdbadmin sdbadmin-$(PYTHON_VERSION) ; \
-	 $(MV) -f taskadmin taskadmin-$(PYTHON_VERSION))
+    (cd $(PROTO_DIR)/usr/demo/$(COMPONENT_NAME) ; \
+     $(MV) -f asadmin asadmin-$(PYTHON_VERSION) ; \
+     $(MV) -f bundle_image bundle_image-$(PYTHON_VERSION) ; \
+     $(MV) -f cfadmin cfadmin-$(PYTHON_VERSION) ; \
+     $(MV) -f cq cq-$(PYTHON_VERSION) ; \
+     $(MV) -f cwutil cwutil-$(PYTHON_VERSION) ; \
+     $(MV) -f dynamodb_dump dynamodb_dump-$(PYTHON_VERSION) ; \
+     $(MV) -f dynamodb_load dynamodb_load-$(PYTHON_VERSION) ; \
+     $(MV) -f elbadmin elbadmin-$(PYTHON_VERSION) ; \
+     $(MV) -f fetch_file fetch_file-$(PYTHON_VERSION) ; \
+     $(MV) -f glacier glacier-$(PYTHON_VERSION) ; \
+     $(MV) -f instance_events instance_events-$(PYTHON_VERSION) ; \
+     $(MV) -f kill_instance kill_instance-$(PYTHON_VERSION) ; \
+     $(MV) -f launch_instance launch_instance-$(PYTHON_VERSION) ; \
+     $(MV) -f list_instances list_instances-$(PYTHON_VERSION) ; \
+     $(MV) -f lss3 lss3-$(PYTHON_VERSION) ; \
+     $(MV) -f mturk mturk-$(PYTHON_VERSION) ; \
+     $(MV) -f pyami_sendmail pyami_sendmail-$(PYTHON_VERSION) ; \
+     $(MV) -f route53 route53-$(PYTHON_VERSION) ; \
+     $(MV) -f s3put s3put-$(PYTHON_VERSION) ; \
+     $(MV) -f sdbadmin sdbadmin-$(PYTHON_VERSION) ; \
+     $(MV) -f taskadmin taskadmin-$(PYTHON_VERSION))
 
 COMPONENT_INSTALL_ARGS +=	--install-script=/usr/demo/$(COMPONENT_NAME)
 
@@ -80,6 +80,6 @@
 # Tests require access to AWS/OpenStack metadata service & the Internet
 test:		$(NO_TESTS)
 
-system-test:    $(NO_TESTS)
+system-test:	$(NO_TESTS)
 
 REQUIRED_PACKAGES += library/python/filechunkio-27
--- a/components/python/boto/boto-PYVER.p5m	Wed Sep 07 14:48:27 2016 -0700
+++ b/components/python/boto/boto-PYVER.p5m	Wed Sep 07 14:48:27 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -62,7 +62,8 @@
 file path=usr/demo/boto/dynamodb_load-$(PYVER) mode=0555
 link path=usr/demo/boto/elbadmin target=elbadmin-$(PYVER) mediator=python \
     mediator-version=$(PYVER)
-file path=usr/demo/boto/elbadmin-$(PYVER) mode=0555
+file path=usr/demo/boto/elbadmin-$(PYVER) mode=0555 \
+    pkg.depend.bypass-generate=.*/compat.*
 link path=usr/demo/boto/fetch_file target=fetch_file-$(PYVER) mediator=python \
     mediator-version=$(PYVER)
 file path=usr/demo/boto/fetch_file-$(PYVER) mode=0555
@@ -109,6 +110,9 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/auth.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/auth_handler.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/awslambda/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/awslambda/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/awslambda/layer1.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/beanstalk/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/beanstalk/exception.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/beanstalk/layer1.py
@@ -129,6 +133,9 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudfront/object.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudfront/origin.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudfront/signers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudhsm/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudhsm/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudhsm/layer1.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudsearch/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudsearch/document.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudsearch/domain.py
@@ -145,9 +152,15 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudsearch2/layer2.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudsearch2/optionstatus.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudsearch2/search.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudsearchdomain/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudsearchdomain/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudsearchdomain/layer1.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudtrail/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudtrail/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/cloudtrail/layer1.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/codedeploy/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/codedeploy/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/codedeploy/layer1.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/cognito/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/cognito/identity/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/cognito/identity/exceptions.py
@@ -156,6 +169,9 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/cognito/sync/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/cognito/sync/layer1.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/compat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/configservice/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/configservice/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/configservice/layer1.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/connection.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/contrib/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/contrib/ymlmessage.py
@@ -237,6 +253,9 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/ec2/volume.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/ec2/volumestatus.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/ec2/zone.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/ec2containerservice/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/ec2containerservice/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/ec2containerservice/layer1.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/ecs/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/ecs/item.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/elasticache/__init__.py
@@ -291,9 +310,15 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/kinesis/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/kinesis/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/kinesis/layer1.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/kms/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/kms/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/kms/layer1.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/logs/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/logs/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/logs/layer1.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/machinelearning/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/machinelearning/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/boto/machinelearning/layer1.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/manage/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/manage/cmdshell.py
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/manage/propget.py
@@ -482,5 +507,8 @@
 depend type=require \
     fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 
+# force a dependency on paramiko; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/paramiko-$(PYV)
+
 # force a dependency on requests; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/requests-$(PYV)