jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[svn r37699] removing py._dist export (only accessed from setup.py 

and py/bin/_makepyrelease.py)

--HG--
branch : trunk
This commit is contained in:
hpk 2007-01-31 23:23:24 +01:00
parent dbb88cdb75
commit ba2dcf16bd
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
py/__init__.py
View File

@ -9,8 +9,8 @@ version = "0.8.80-alpha2"
initpkg(__name__, initpkg(__name__,
description = "py.test and the py lib", description = "py.test and the py lib",
revision = int('$LastChangedRevision: 37696 $'.split(':')[1][:-1]), revision = int('$LastChangedRevision: 37699 $'.split(':')[1][:-1]),
lastchangedate = '$LastChangedDate: 2007-01-31 22:55:30 +0100 (Wed, 31 Jan 2007) $', lastchangedate = '$LastChangedDate: 2007-01-31 23:23:24 +0100 (Wed, 31 Jan 2007) $',
version = version, version = version,
url = "http://codespeak.net/py", url = "http://codespeak.net/py",
download_url = "http://codespeak.net/download/py/%s.tar.gz" %(version,), download_url = "http://codespeak.net/download/py/%s.tar.gz" %(version,),
@ -21,8 +21,6 @@ initpkg(__name__,
long_description = globals()['__doc__'], long_description = globals()['__doc__'],
exportdefs = { exportdefs = {
'_dist.setup' : ('./misc/_dist.py', 'setup'),
# helpers for use from test functions or collectors # helpers for use from test functions or collectors
'test.raises' : ('./test/raises.py', 'raises'), 'test.raises' : ('./test/raises.py', 'raises'),
'test.deprecated_call' : ('./test/deprecate.py', 'deprecated_call'), 'test.deprecated_call' : ('./test/deprecate.py', 'deprecated_call'),

19
py/bin/_makepyrelease.py
View File

@ -51,16 +51,17 @@ def make_distfiles(tmpdir):
distdir = tmpdir.ensure('dist', dir=1) distdir = tmpdir.ensure('dist', dir=1)
oldir = rootdir.chdir() oldir = rootdir.chdir()
try: try:
from py.__.misc.dist import setup
trace("invoking sdist, generating into %s" % (distdir,)) trace("invoking sdist, generating into %s" % (distdir,))
py._dist.setup(py, script_name="setup.py", setup(py, script_name="setup.py",
script_args=('-q', 'sdist', '--no-prune', script_args=('-q', 'sdist', '--no-prune',
'-m', str(manifest), '-m', str(manifest),
'--formats=gztar,zip', '--formats=gztar,zip',
'-d', str(distdir))) '-d', str(distdir)))
py._dist.setup(py, script_name="setup.py", setup(py, script_name="setup.py",
script_args=('-q', 'bdist_wininst', script_args=('-q', 'bdist_wininst',
#'-m', str(manifest), #'-m', str(manifest),
'-d', str(distdir))) '-d', str(distdir)))
finally: finally:
oldir.chdir() oldir.chdir()
return distdir return distdir

5
setup.py
View File

@ -1,2 +1,3 @@
import py import py
py._dist.setup(py) from py.__.misc._dist import setup
setup(py)