# HG changeset patch -- Bitbucket.org
# Project py-trunk
# URL http://bitbucket.org/hpk42/py-trunk/overview
# User holger krekel <hol...@merlinux.eu>
# Date 1277719152 -7200
# Node ID 08462a57259b9a0ffc1431253f4b20d5f2cc2b6b
# Parent 10166d87c90ab42b0948c14619859b9d762487ef
install plain py.test script also for jython
--- a/bin-for-dist/test_install.py
+++ b/bin-for-dist/test_install.py
@@ -166,7 +166,7 @@ def test_cmdline_entrypoints(monkeypatch
expected = "%s-jython" % script
assert expected in points
for script in unversioned_scripts:
- assert script not in points
+ assert script in points
points = cmdline_entrypoints((2,5,1), "xyz", 'pypy-c-XYZ')
for script in versioned_scripts:
--- a/setup.py
+++ b/setup.py
@@ -71,9 +71,9 @@ def cmdline_entrypoints(versioninfo, pla
'py.test-%s.%s' % versioninfo[:2] : 'py.cmdline:pytest',
'py.which-%s.%s' % versioninfo[:2] : 'py.cmdline:pywhich'
}
- for x in ['py.cleanup', 'py.convert_unittest', 'py.countloc',
- 'py.lookup', 'py.svnwcrevert', 'py.which', 'py.test']:
- points[x] = "py.cmdline:%s" % x.replace('.','')
+ for x in ['py.cleanup', 'py.convert_unittest', 'py.countloc',
+ 'py.lookup', 'py.svnwcrevert', 'py.which', 'py.test']:
+ points[x] = "py.cmdline:%s" % x.replace('.','')
return points
def make_entry_points():
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -51,6 +51,8 @@ Bug fixes / Maintenance
- fix terminal writing on win32/python2.4
- py.process.cmdexec() now tries harder to return properly encoded unicode
objects
on all python versions
+- install plain py.test/py.which scripts also for Jython, this helps to
+ get canonical script paths in virtualenv situations
Changes between 1.3.0 and 1.3.1
==================================================
_______________________________________________
py-svn mailing list
py-svn@codespeak.net
http://codespeak.net/mailman/listinfo/py-svn
