[py-svn] r37699 - in py/trunk: . py py/bin
hpk at codespeak.net
hpk at codespeak.net
Wed Jan 31 23:23:26 CET 2007
Author: hpk
Date: Wed Jan 31 23:23:24 2007
New Revision: 37699
Modified:
py/trunk/py/__init__.py
py/trunk/py/bin/_makepyrelease.py
py/trunk/setup.py
Log:
removing py._dist export (only accessed from setup.py
and py/bin/_makepyrelease.py)
Modified: py/trunk/py/__init__.py
==============================================================================
--- py/trunk/py/__init__.py (original)
+++ py/trunk/py/__init__.py Wed Jan 31 23:23:24 2007
@@ -21,8 +21,6 @@
long_description = globals()['__doc__'],
exportdefs = {
- '_dist.setup' : ('./misc/_dist.py', 'setup'),
-
# helpers for use from test functions or collectors
'test.raises' : ('./test/raises.py', 'raises'),
'test.deprecated_call' : ('./test/deprecate.py', 'deprecated_call'),
Modified: py/trunk/py/bin/_makepyrelease.py
==============================================================================
--- py/trunk/py/bin/_makepyrelease.py (original)
+++ py/trunk/py/bin/_makepyrelease.py Wed Jan 31 23:23:24 2007
@@ -51,16 +51,17 @@
distdir = tmpdir.ensure('dist', dir=1)
oldir = rootdir.chdir()
try:
+ from py.__.misc.dist import setup
trace("invoking sdist, generating into %s" % (distdir,))
- py._dist.setup(py, script_name="setup.py",
- script_args=('-q', 'sdist', '--no-prune',
- '-m', str(manifest),
- '--formats=gztar,zip',
- '-d', str(distdir)))
- py._dist.setup(py, script_name="setup.py",
- script_args=('-q', 'bdist_wininst',
- #'-m', str(manifest),
- '-d', str(distdir)))
+ setup(py, script_name="setup.py",
+ script_args=('-q', 'sdist', '--no-prune',
+ '-m', str(manifest),
+ '--formats=gztar,zip',
+ '-d', str(distdir)))
+ setup(py, script_name="setup.py",
+ script_args=('-q', 'bdist_wininst',
+ #'-m', str(manifest),
+ '-d', str(distdir)))
finally:
oldir.chdir()
return distdir
Modified: py/trunk/setup.py
==============================================================================
--- py/trunk/setup.py (original)
+++ py/trunk/setup.py Wed Jan 31 23:23:24 2007
@@ -1,2 +1,3 @@
-import py
-py._dist.setup(py)
+import py
+from py.__.misc._dist import setup
+setup(py)
More information about the pytest-commit
mailing list