# HG changeset patch
# User Mike Sullivan <Mike.Sullivan@Oracle.COM>
# Date 1331148643 28800
# Node ID 2168b2449dc806fc301ca324f9e7216c6a07595c
# Parent  d3876c4a59c8a727d3b26aa377f84dbb61f52432
7098136 Integrate python-nose into Userland (fix 2.7 package, use more cache-friendly source link)

diff -r d3876c4a59c8 -r 2168b2449dc8 components/python/nose/Makefile
--- a/components/python/nose/Makefile	Wed Mar 07 10:30:02 2012 -0800
+++ b/components/python/nose/Makefile	Wed Mar 07 11:30:43 2012 -0800
@@ -29,9 +29,9 @@
 COMPONENT_VERSION=	1.0.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=  http://code.google.com/p/python-nose/
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC)%20%281%29.tar.gz
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:186d223d0d74e94093bc0c42223d2ad92c090eed
-COMPONENT_ARCHIVE_URL=	http://python-nose.googlecode.com/files/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	http://pypi.python.org/packages/source/n/nose/$(COMPONENT_ARCHIVE)
 
 include $(WS_TOP)/make-rules/prep.mk
 include $(WS_TOP)/make-rules/setup.py.mk
diff -r d3876c4a59c8 -r 2168b2449dc8 components/python/nose/nose-27.p5m
--- a/components/python/nose/nose-27.p5m	Wed Mar 07 10:30:02 2012 -0800
+++ b/components/python/nose/nose-27.p5m	Wed Mar 07 11:30:43 2012 -0800
@@ -34,19 +34,22 @@
 dir path=usr/lib/python2.7
 dir path=usr/lib/python2.7/vendor-packages
 dir path=usr/lib/python2.7/vendor-packages/nose
-dir path=usr/lib/python2.7/vendor-packages/nose-1.0.0-py2.7.egg-info
 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
 
+# nosetests-2.7 shows up and egg-info turns into a directory
+# structure when the 2.7 version of setuptools appears, but
+# we are not there yet
+file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info
 # 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/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