17628782 pip missing as a dependency for pbr
18812257 update six to 1.6.1
18812282 update iso8601 to 0.1.10
18812286 update websockify to 0.5.1
18817409 update pbr to 0.8.1
18817417 update oslo.config to 1.3.0
--- a/components/python/iso8601/Makefile Mon May 26 23:01:02 2014 -0700
+++ b/components/python/iso8601/Makefile Wed May 28 11:14:55 2014 -0700
@@ -18,16 +18,16 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012-2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= iso8601
-COMPONENT_VERSION= 0.1.4
+COMPONENT_VERSION= 0.1.10
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:7a28ccdfb316960431aa7f589f71cb10e0675917e36f6d718d9c03ec6e97f60d
+ sha256:e712ff3a18604833f5073e836aad795b21170b19bbef70947c441ed89d0ac0e1
COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_PROJECT_URL= http://code.google.com/p/pyiso8601/
COMPONENT_BUGDB= python-mod/iso8601
--- a/components/python/iso8601/iso8601-PYVER.p5m Mon May 26 23:01:02 2014 -0700
+++ b/components/python/iso8601/iso8601-PYVER.p5m Wed May 28 11:14:55 2014 -0700
@@ -28,7 +28,7 @@
value="This Python module parses the most common forms of ISO 8601 date strings into datetime objects."
set name=com.oracle.info.description \
value="the Python iso8601 date parsing module"
-set name=com.oracle.info.tpno value=14503
+set name=com.oracle.info.tpno value=16616
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -44,6 +44,10 @@
file path=usr/lib/python$(PYVER)/vendor-packages/iso8601/iso8601.py
license LICENSE license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/iso8601-$(PYV)@0.1.4,5.12-5.12.0.0.0.41.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
@@ -51,7 +55,3 @@
# force a dependency on the iso8601 package
depend type=require \
fmri=library/python/iso8601@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-
-# force the rename with an optional dependency on the old name
-depend type=optional \
- fmri=library/python-2/iso8601-$(PYV)@0.1.4,5.12-5.12.0.0.0.41.0
--- a/components/python/oslo.config/Makefile Mon May 26 23:01:02 2014 -0700
+++ b/components/python/oslo.config/Makefile Wed May 28 11:14:55 2014 -0700
@@ -18,16 +18,18 @@
#
# CDDL HEADER END
#
+
+#
# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= oslo.config
-COMPONENT_VERSION= 1.2.1
+COMPONENT_VERSION= 1.3.0
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:e4ccf489159f0c2b1932ea282f7663daada0a7f8309edc4c34904605a98cf9f2
+ sha256:1fa44f663f7109ccc3ddd393fbc5a7a077208e116f94e41ada7fbd977f27cbab
COMPONENT_ARCHIVE_URL= http://tarballs.openstack.org/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL= http://www.openstack.org/
COMPONENT_BUGDB= python-mod/oslo.config
--- a/components/python/oslo.config/oslo.config-PYVER.p5m Mon May 26 23:01:02 2014 -0700
+++ b/components/python/oslo.config/oslo.config-PYVER.p5m Wed May 28 11:14:55 2014 -0700
@@ -29,7 +29,7 @@
set name=pkg.description \
value="The Oslo configuration API supports parsing command line arguments and .ini style configuration files."
set name=com.oracle.info.description value="the Oslo Configuration Library"
-set name=com.oracle.info.tpno value=16316
+set name=com.oracle.info.tpno value=17861
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
@@ -50,6 +50,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/oslo/config/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo/config/cfg.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo/config/iniparser.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo/config/types.py
license LICENSE license="Apache v2.0"
# force the rename with an optional dependency on the old name
--- a/components/python/pbr/Makefile Mon May 26 23:01:02 2014 -0700
+++ b/components/python/pbr/Makefile Wed May 28 11:14:55 2014 -0700
@@ -26,11 +26,11 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= pbr
-COMPONENT_VERSION= 0.5.21
+COMPONENT_VERSION= 0.8.1
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:bba90ab981fc2c086650dad4413e4626cc8b199f1c848959469f26224d3ab381
+ sha256:aad1f8296aa6c5379c3ccb07cf7819a7482bb39a835b70d7e5faa4a00fa0876a
COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_PROJECT_URL= http://pypi.python.org/pypi/pbr/
COMPONENT_BUGDB= python-mod/pbr
--- a/components/python/pbr/pbr-PYVER.p5m Mon May 26 23:01:02 2014 -0700
+++ b/components/python/pbr/pbr-PYVER.p5m Wed May 28 11:14:55 2014 -0700
@@ -29,7 +29,7 @@
set name=pkg.description \
value="pbr is a library that injects some useful and sensible default behaviors into your setuptools run. It builds on top of d2to1 to provide for declarative configuration. It then filters the setup.cfg data through a setup hook to fill in default values and provide more sensible behaviors."
set name=com.oracle.info.description value="the Python pbr module"
-set name=com.oracle.info.tpno value=14503
+set name=com.oracle.info.tpno value=17860
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -63,6 +63,10 @@
# flush this out.
depend type=group fmri=library/python/nose-$(PYV)
+# force a group dependency on the optional pip; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python/pip-$(PYV)
+
# force the rename with an optional dependency on the old name
depend type=optional \
fmri=library/python-2/pbr-$(PYV)@0.5.21,5.12-5.12.0.0.0.41.0
--- a/components/python/six/Makefile Mon May 26 23:01:02 2014 -0700
+++ b/components/python/six/Makefile Wed May 28 11:14:55 2014 -0700
@@ -18,16 +18,16 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= six
-COMPONENT_VERSION= 1.4.1
+COMPONENT_VERSION= 1.6.1
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:f045afd6dffb755cc0411acb7ce9acc4de0e71261d4b5f91de2e68d9aa5f8367
+ sha256:d4392a7c8d91b005c002568a85faf617c67241c8cd8399cc395e8f1005aff80d
COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_PROJECT_URL= http://pypi.python.org/pypi/six/
COMPONENT_BUGDB= python-mod/six
--- a/components/python/six/six-PYVER.p5m Mon May 26 23:01:02 2014 -0700
+++ b/components/python/six/six-PYVER.p5m Wed May 28 11:14:55 2014 -0700
@@ -27,7 +27,7 @@
set name=pkg.description \
value="Six is a Python 2 and 3 compatibility library. It provides utility functions for smoothing over the differences between the Python versions with the goal of writing Python code that is compatible on both Python versions."
set name=com.oracle.info.description value="the Python six module"
-set name=com.oracle.info.tpno value=16000
+set name=com.oracle.info.tpno value=17859
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -35,10 +35,16 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2013/241
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info
+file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/six.py
license LICENSE license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/six-$(PYV)@1.4.1,5.12-5.12.0.0.0.41.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
@@ -46,6 +52,3 @@
# force a dependency on the six package
depend type=require \
fmri=library/python/six@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-
-# force the rename with an optional dependency on the old name
-depend type=optional fmri=library/python-2/six-$(PYV)@1.4.1,5.12-5.12.0.0.0.41.0
--- a/components/python/websockify/Makefile Mon May 26 23:01:02 2014 -0700
+++ b/components/python/websockify/Makefile Wed May 28 11:14:55 2014 -0700
@@ -25,11 +25,11 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= websockify
-COMPONENT_VERSION= 0.3.0
+COMPONENT_VERSION= 0.5.1
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= v$(COMPONENT_VERSION).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:6466ba0031635a8442006ec5bfa9a19c92906b5229119b8a3cd8556d348ae801
+ sha256:b2704e9127ef8698b5b73b0cb247abd700d2a893bdd32078117e5ebc7f69cbbf
COMPONENT_PROJECT_URL= https://github.com/kanaka/websockify
COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)/archive/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= python-mod/websockify
--- a/components/python/websockify/websockify-PYVER.p5m Mon May 26 23:01:02 2014 -0700
+++ b/components/python/websockify/websockify-PYVER.p5m Wed May 28 11:14:55 2014 -0700
@@ -30,7 +30,7 @@
value="Websockify translates WebSockets traffic to normal socket traffic. Websockify accepts the WebSockets handshake, parses it, and then begins forwarding traffic between the client and the target in both directions."
set name=com.oracle.info.description \
value="Websockify, the WebSockets translater"
-set name=com.oracle.info.tpno value=14503
+set name=com.oracle.info.tpno value=16167
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python \
value="org.opensolaris.category.2008:Web Services/Communications"