install plain py.test script also for jython

--HG--
branch : trunk
This commit is contained in:
holger krekel 2010-06-28 11:59:12 +02:00
parent da52304a6e
commit 2f50ed3e99
3 changed files with 6 additions and 4 deletions

View File

@ -51,6 +51,8 @@ Bug fixes / Maintenance
- fix terminal writing on win32/python2.4 - fix terminal writing on win32/python2.4
- py.process.cmdexec() now tries harder to return properly encoded unicode objects - py.process.cmdexec() now tries harder to return properly encoded unicode objects
on all python versions 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 Changes between 1.3.0 and 1.3.1
================================================== ==================================================

View File

@ -166,7 +166,7 @@ def test_cmdline_entrypoints(monkeypatch):
expected = "%s-jython" % script expected = "%s-jython" % script
assert expected in points assert expected in points
for script in unversioned_scripts: for script in unversioned_scripts:
assert script not in points assert script in points
points = cmdline_entrypoints((2,5,1), "xyz", 'pypy-c-XYZ') points = cmdline_entrypoints((2,5,1), "xyz", 'pypy-c-XYZ')
for script in versioned_scripts: for script in versioned_scripts:

View File

@ -71,9 +71,9 @@ def cmdline_entrypoints(versioninfo, platform, basename):
'py.test-%s.%s' % versioninfo[:2] : 'py.cmdline:pytest', 'py.test-%s.%s' % versioninfo[:2] : 'py.cmdline:pytest',
'py.which-%s.%s' % versioninfo[:2] : 'py.cmdline:pywhich' 'py.which-%s.%s' % versioninfo[:2] : 'py.cmdline:pywhich'
} }
for x in ['py.cleanup', 'py.convert_unittest', 'py.countloc', for x in ['py.cleanup', 'py.convert_unittest', 'py.countloc',
'py.lookup', 'py.svnwcrevert', 'py.which', 'py.test']: 'py.lookup', 'py.svnwcrevert', 'py.which', 'py.test']:
points[x] = "py.cmdline:%s" % x.replace('.','') points[x] = "py.cmdline:%s" % x.replace('.','')
return points return points
def make_entry_points(): def make_entry_points():