traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Packaging cleanup: remove use of script_name where obsolete

This commit is contained in:
Éric Araujo 2011-06-08 04:06:50 +02:00
parent ef3062f7af
commit 04fc999c05
6 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/packaging/run.py
View File

@ -405,7 +405,6 @@ class Dispatcher:
self.verbose = 1 self.verbose = 1
self.dry_run = False self.dry_run = False
self.help = False self.help = False
self.script_name = 'pysetup'
self.cmdclass = {} self.cmdclass = {}
self.commands = [] self.commands = []
self.command_options = {} self.command_options = {}

1
Lib/packaging/tests/test_command_bdist_dumb.py
View File

@ -49,7 +49,6 @@ class BuildDumbTestCase(support.TempdirManager,
'py_modules': ['foo'], 'py_modules': ['foo'],
'url': 'xxx', 'author': 'xxx', 'url': 'xxx', 'author': 'xxx',
'author_email': 'xxx'}) 'author_email': 'xxx'})
dist.script_name = 'setup.py'
os.chdir(pkg_dir) os.chdir(pkg_dir)
sys.argv[:] = ['setup.py'] sys.argv[:] = ['setup.py']

4
Lib/packaging/tests/test_command_build_py.py
View File

@ -33,9 +33,7 @@ class BuildPyTestCase(support.TempdirManager,
dist = Distribution({"packages": ["pkg"], dist = Distribution({"packages": ["pkg"],
"package_dir": sources}) "package_dir": sources})
# script_name need not exist, it just need to be initialized
dist.script_name = os.path.join(sources, "setup.py")
dist.command_obj["build"] = support.DummyCommand( dist.command_obj["build"] = support.DummyCommand(
force=False, force=False,
build_lib=destination, build_lib=destination,
@ -89,8 +87,6 @@ class BuildPyTestCase(support.TempdirManager,
dist = Distribution({"packages": ["pkg"], dist = Distribution({"packages": ["pkg"],
"package_dir": sources, "package_dir": sources,
"package_data": {"pkg": ["doc/*"]}}) "package_data": {"pkg": ["doc/*"]}})
# script_name need not exist, it just need to be initialized
dist.script_name = os.path.join(sources, "setup.py")
dist.script_args = ["build"] dist.script_args = ["build"]
dist.parse_command_line() dist.parse_command_line()

2
Lib/packaging/tests/test_command_install_dist.py
View File

@ -30,8 +30,6 @@ class InstallTestCase(support.TempdirManager,
destination = os.path.join(builddir, "installation") destination = os.path.join(builddir, "installation")
dist = Distribution({"name": "foopkg"}) dist = Distribution({"name": "foopkg"})
# script_name need not exist, it just need to be initialized
dist.script_name = os.path.join(builddir, "setup.py")
dist.command_obj["build"] = support.DummyCommand( dist.command_obj["build"] = support.DummyCommand(
build_base=builddir, build_base=builddir,
build_lib=os.path.join(builddir, "lib"), build_lib=os.path.join(builddir, "lib"),

2
Lib/packaging/tests/test_command_install_lib.py
View File

@ -65,7 +65,6 @@ class InstallLibTestCase(support.TempdirManager,
self.write_file(f, '# python package') self.write_file(f, '# python package')
cmd.distribution.ext_modules = [Extension('foo', ['xxx'])] cmd.distribution.ext_modules = [Extension('foo', ['xxx'])]
cmd.distribution.packages = [pkg_dir] cmd.distribution.packages = [pkg_dir]
cmd.distribution.script_name = 'setup.py'
# make sure the build_lib is set the temp dir # make sure the build_lib is set the temp dir
build_dir = os.path.split(pkg_dir)[0] build_dir = os.path.split(pkg_dir)[0]
@ -86,7 +85,6 @@ class InstallLibTestCase(support.TempdirManager,
self.write_file(f, '# python package') self.write_file(f, '# python package')
cmd.distribution.ext_modules = [Extension('foo', ['xxx'])] cmd.distribution.ext_modules = [Extension('foo', ['xxx'])]
cmd.distribution.packages = [pkg_dir] cmd.distribution.packages = [pkg_dir]
cmd.distribution.script_name = 'setup.py'
# get_input should return 2 elements # get_input should return 2 elements
self.assertEqual(len(cmd.get_inputs()), 2) self.assertEqual(len(cmd.get_inputs()), 2)

10
Lib/packaging/tests/test_command_sdist.py
View File

@ -24,12 +24,6 @@ from packaging.util import find_executable
from packaging.tests import support from packaging.tests import support
from shutil import get_archive_formats from shutil import get_archive_formats
SETUP_PY = """
from packaging.core import setup
import somecode
setup(name='fake')
"""
MANIFEST = """\ MANIFEST = """\
# file GENERATED by packaging, do NOT edit # file GENERATED by packaging, do NOT edit
@ -57,8 +51,6 @@ class SDistTestCase(support.TempdirManager,
restore_environ = ['HOME'] restore_environ = ['HOME']
def setUp(self): def setUp(self):
# PyPIRCCommandTestCase creates a temp dir already
# and put it in self.tmp_dir
super(SDistTestCase, self).setUp() super(SDistTestCase, self).setUp()
self.tmp_dir = self.mkdtemp() self.tmp_dir = self.mkdtemp()
os.environ['HOME'] = self.tmp_dir os.environ['HOME'] = self.tmp_dir
@ -69,7 +61,6 @@ class SDistTestCase(support.TempdirManager,
# a package, and a README # a package, and a README
self.write_file((self.tmp_dir, 'README'), 'xxx') self.write_file((self.tmp_dir, 'README'), 'xxx')
self.write_file((self.tmp_dir, 'somecode', '__init__.py'), '#') self.write_file((self.tmp_dir, 'somecode', '__init__.py'), '#')
self.write_file((self.tmp_dir, 'setup.py'), SETUP_PY)
os.chdir(self.tmp_dir) os.chdir(self.tmp_dir)
def tearDown(self): def tearDown(self):
@ -84,7 +75,6 @@ class SDistTestCase(support.TempdirManager,
'url': 'xxx', 'author': 'xxx', 'url': 'xxx', 'author': 'xxx',
'author_email': 'xxx'} 'author_email': 'xxx'}
dist = Distribution(metadata) dist = Distribution(metadata)
dist.script_name = 'setup.py'
dist.packages = ['somecode'] dist.packages = ['somecode']
dist.include_package_data = True dist.include_package_data = True
cmd = sdist(dist) cmd = sdist(dist)