16433531 - Update Nose to 1.2.1
authorRich Burridge <rich.burridge@oracle.com>
Wed, 03 Apr 2013 09:07:23 -0700
changeset 1247 6b8e3d1edadd
parent 1246 164605dfef4e
child 1248 8b78906f3eb9
16433531 - Update Nose to 1.2.1
components/python/nose/Makefile
components/python/nose/nose-26.p5m
components/python/nose/nose-27.p5m
components/python/nose/nose-GENFRAG.p5m
components/python/nose/nose-PYVER.p5m
components/python/nose/nose.p5m
--- a/components/python/nose/Makefile	Tue Apr 02 15:14:34 2013 -0700
+++ b/components/python/nose/Makefile	Wed Apr 03 09:07:23 2013 -0700
@@ -20,18 +20,18 @@
 #
 
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		nose
-COMPONENT_VERSION=	1.1.2
+COMPONENT_VERSION=	1.2.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=  http://code.google.com/p/python-nose/
+COMPONENT_PROJECT_URL=  https://github.com/nose-devs/nose
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:b1ba12c1c45323fd8695be68ce7228456b86e51234f167027ebbc4ccda852c61
+    sha256:2171e9202d118d302d5db1decb52dd862b79e2a626ca19653a6914574a6ca7d9
 COMPONENT_ARCHIVE_URL=	http://pypi.python.org/packages/source/n/nose/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	python-mod/nose
 
--- a/components/python/nose/nose-26.p5m	Tue Apr 02 15:14:34 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="A unittest-based testing framework for python that makes writing and running tests easier"
-set name=com.oracle.info.description value="the nose unit test framework for Python 2.6"
-set name=com.oracle.info.tpno value=6585
-set name=info.classification value=org.opensolaris.category.2008:Development/Python
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2011/198
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/nose
-dir path=usr/lib/python2.6/vendor-packages/nose-$(COMPONENT_VERSION)-py2.6.egg-info
-dir path=usr/lib/python2.6/vendor-packages/nose/ext
-dir path=usr/lib/python2.6/vendor-packages/nose/plugins
-dir path=usr/lib/python2.6/vendor-packages/nose/sphinx
-
-file path=usr/bin/nosetests-2.6
-file path=usr/lib/python2.6/vendor-packages/nose-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
-file path=usr/lib/python2.6/vendor-packages/nose-$(COMPONENT_VERSION)-py2.6.egg-info/entry_points.txt
-file path=usr/lib/python2.6/vendor-packages/nose-$(COMPONENT_VERSION)-py2.6.egg-info/not-zip-safe
-file path=usr/lib/python2.6/vendor-packages/nose-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
-file path=usr/lib/python2.6/vendor-packages/nose-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
-file path=usr/lib/python2.6/vendor-packages/nose-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
-file path=usr/lib/python2.6/vendor-packages/nose/__init__.py
-file path=usr/lib/python2.6/vendor-packages/nose/case.py
-file path=usr/lib/python2.6/vendor-packages/nose/commands.py
-file path=usr/lib/python2.6/vendor-packages/nose/config.py
-file path=usr/lib/python2.6/vendor-packages/nose/core.py
-file path=usr/lib/python2.6/vendor-packages/nose/exc.py
-file path=usr/lib/python2.6/vendor-packages/nose/ext/__init__.py
-file path=usr/lib/python2.6/vendor-packages/nose/ext/dtcompat.py
-file path=usr/lib/python2.6/vendor-packages/nose/failure.py
-file path=usr/lib/python2.6/vendor-packages/nose/importer.py
-file path=usr/lib/python2.6/vendor-packages/nose/inspector.py
-file path=usr/lib/python2.6/vendor-packages/nose/loader.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/__init__.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/allmodules.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/attrib.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/base.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/builtin.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/capture.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/collect.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/cover.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/debug.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/deprecated.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/doctests.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/errorclass.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/failuredetail.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/isolate.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/logcapture.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/manager.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/multiprocess.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/plugintest.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/prof.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/skip.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/testid.py
-file path=usr/lib/python2.6/vendor-packages/nose/plugins/xunit.py
-file path=usr/lib/python2.6/vendor-packages/nose/proxy.py
-file path=usr/lib/python2.6/vendor-packages/nose/pyversion.py
-file path=usr/lib/python2.6/vendor-packages/nose/result.py
-file path=usr/lib/python2.6/vendor-packages/nose/selector.py
-file path=usr/lib/python2.6/vendor-packages/nose/sphinx/__init__.py
-file path=usr/lib/python2.6/vendor-packages/nose/sphinx/pluginopts.py
-file path=usr/lib/python2.6/vendor-packages/nose/suite.py
-file path=usr/lib/python2.6/vendor-packages/nose/tools.py
-file path=usr/lib/python2.6/vendor-packages/nose/twistedtools.py
-file path=usr/lib/python2.6/vendor-packages/nose/usage.txt
-file path=usr/lib/python2.6/vendor-packages/nose/util.py
-
-link path=usr/bin/nosetests target=nosetests-2.6 \
-    mediator=python mediator-version=2.6
-
-# force a dependency on the Python 2.6 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.6 \
-	pkg.debug.depend.path=usr/bin type=require
-
-# force a dependency on the nose package
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    type=require
-
-license nose.license license=LGPLv2.1
--- a/components/python/nose/nose-27.p5m	Tue Apr 02 15:14:34 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="A unittest-based testing framework for python that makes writing and running tests easier"
-set name=com.oracle.info.description value="the nose unit test framework for Python 2.7"
-set name=com.oracle.info.tpno value=6585
-set name=info.classification value=org.opensolaris.category.2008:Development/Python
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2011/198
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/lib
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/
-dir path=usr/lib/python2.7/vendor-packages/nose
-dir path=usr/lib/python2.7/vendor-packages/nose/ext
-dir path=usr/lib/python2.7/vendor-packages/nose/plugins
-dir path=usr/lib/python2.7/vendor-packages/nose/sphinx
-
-# pkgdepend(1) and python 2.7 don't play well yet.
-file path=usr/bin/nosetests-2.7 pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/dependency_links.txt
-file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/entry_points.txt
-file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/not-zip-safe
-file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/PKG-INFO
-file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/SOURCES.txt
-file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/top_level.txt
-file path=usr/lib/python2.7/vendor-packages/nose/__init__.py
-file path=usr/lib/python2.7/vendor-packages/nose/case.py
-file path=usr/lib/python2.7/vendor-packages/nose/commands.py
-file path=usr/lib/python2.7/vendor-packages/nose/config.py
-file path=usr/lib/python2.7/vendor-packages/nose/core.py
-file path=usr/lib/python2.7/vendor-packages/nose/exc.py
-file path=usr/lib/python2.7/vendor-packages/nose/ext/__init__.py
-file path=usr/lib/python2.7/vendor-packages/nose/ext/dtcompat.py
-file path=usr/lib/python2.7/vendor-packages/nose/failure.py
-file path=usr/lib/python2.7/vendor-packages/nose/importer.py
-file path=usr/lib/python2.7/vendor-packages/nose/inspector.py
-file path=usr/lib/python2.7/vendor-packages/nose/loader.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/__init__.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/allmodules.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/attrib.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/base.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/builtin.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/capture.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/collect.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/cover.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/debug.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/deprecated.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/doctests.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/errorclass.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/failuredetail.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/isolate.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/logcapture.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/manager.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/multiprocess.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/plugintest.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/prof.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/skip.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/testid.py
-file path=usr/lib/python2.7/vendor-packages/nose/plugins/xunit.py
-file path=usr/lib/python2.7/vendor-packages/nose/proxy.py
-file path=usr/lib/python2.7/vendor-packages/nose/pyversion.py
-file path=usr/lib/python2.7/vendor-packages/nose/result.py
-file path=usr/lib/python2.7/vendor-packages/nose/selector.py
-file path=usr/lib/python2.7/vendor-packages/nose/sphinx/__init__.py
-file path=usr/lib/python2.7/vendor-packages/nose/sphinx/pluginopts.py
-file path=usr/lib/python2.7/vendor-packages/nose/suite.py
-file path=usr/lib/python2.7/vendor-packages/nose/tools.py
-file path=usr/lib/python2.7/vendor-packages/nose/twistedtools.py
-file path=usr/lib/python2.7/vendor-packages/nose/usage.txt
-file path=usr/lib/python2.7/vendor-packages/nose/util.py
-
-link path=usr/bin/nosetests target=nosetests-2.7 \
-    mediator=python mediator-version=2.7
-
-# force a dependency on the Python 2.7 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.7 \
-	pkg.debug.depend.path=usr/bin type=require
-
-# force a dependency on the nose package
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    type=require
-
-license nose.license license=LGPLv2.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/nose/nose-GENFRAG.p5m	Wed Apr 03 09:07:23 2013 -0700
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+dir  path=usr
+dir  path=usr/share
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
+file nosetests.1 path=usr/share/man/man1/nosetests.1
+license nose.license license=LGPLv2.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/nose/nose-PYVER.p5m	Wed Apr 03 09:07:23 2013 -0700
@@ -0,0 +1,111 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/nose-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="A unittest-based testing framework for python that makes writing and running tests easier"
+set name=com.oracle.info.description value="the Python nose unit test framework"
+set name=com.oracle.info.tpno value=12933
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2011/198
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+dir  path=usr
+dir  path=usr/bin
+link path=usr/bin/nosetests target=nosetests-$(PYVER) mediator=python \
+    mediator-version=$(PYVER)
+file path=usr/bin/nosetests-$(PYVER)
+dir  path=usr/lib
+dir  path=usr/lib/python$(PYVER)
+dir  path=usr/lib/python$(PYVER)/vendor-packages
+dir  path=usr/lib/python$(PYVER)/vendor-packages/nose
+dir  path=usr/lib/python$(PYVER)/vendor-packages/nose-$(COMPONENT_VERSION)-py$(PYVER).egg-info
+file path=usr/lib/python$(PYVER)/vendor-packages/nose-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/nose-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/nose-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/nose-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/nose-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/nose-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/case.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/commands.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/config.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/core.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/exc.py
+dir  path=usr/lib/python$(PYVER)/vendor-packages/nose/ext
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/ext/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/ext/dtcompat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/failure.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/importer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/inspector.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/loader.py
+dir  path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/allmodules.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/attrib.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/builtin.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/capture.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/collect.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/cover.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/debug.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/deprecated.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/doctests.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/errorclass.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/failuredetail.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/isolate.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/logcapture.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/manager.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/multiprocess.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/plugintest.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/prof.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/skip.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/testid.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/plugins/xunit.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/proxy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/pyversion.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/result.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/selector.py
+dir  path=usr/lib/python$(PYVER)/vendor-packages/nose/sphinx
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/sphinx/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/sphinx/pluginopts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/suite.py
+dir  path=usr/lib/python$(PYVER)/vendor-packages/nose/tools
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/tools/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/tools/nontrivial.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/tools/trivial.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/twistedtools.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/usage.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/nose/util.py
+license nose.license license=LGPLv2.1
+
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+
+# force a dependency on the nose package
+depend type=require \
+    fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/nose/nose.p5m	Tue Apr 02 15:14:34 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-
-<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-
-set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="A unittest-based testing framework for python that makes writing and running tests easier"
-set name=com.oracle.info.description value="the nose unit test framework for Python"
-set name=com.oracle.info.tpno value=6585
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2011/198
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-dir path=usr
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file nosetests.1 path=usr/share/man/man1/nosetests.1
-
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-26 \
-    type=conditional
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-27 \
-    type=conditional
-
-license nose.license license=LGPLv2.1