diff options
author | Éric Araujo <merwok@netwok.org> | 2011-06-08 02:06:50 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2011-06-08 02:06:50 (GMT) |
commit | 04fc999c057dffee882e8711ba28ec51ee092698 (patch) | |
tree | 90e782dcec1523b7fb985076cbe88d5b664bec77 /Lib | |
parent | ef3062f7afec3a6f291050beaa6ef5d56f7047f3 (diff) | |
download | cpython-04fc999c057dffee882e8711ba28ec51ee092698.zip cpython-04fc999c057dffee882e8711ba28ec51ee092698.tar.gz cpython-04fc999c057dffee882e8711ba28ec51ee092698.tar.bz2 |
Packaging cleanup: remove use of script_name where obsolete
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/packaging/run.py | 1 | ||||
-rw-r--r-- | Lib/packaging/tests/test_command_bdist_dumb.py | 1 | ||||
-rw-r--r-- | Lib/packaging/tests/test_command_build_py.py | 4 | ||||
-rw-r--r-- | Lib/packaging/tests/test_command_install_dist.py | 2 | ||||
-rw-r--r-- | Lib/packaging/tests/test_command_install_lib.py | 2 | ||||
-rw-r--r-- | Lib/packaging/tests/test_command_sdist.py | 10 |
6 files changed, 0 insertions, 20 deletions
diff --git a/Lib/packaging/run.py b/Lib/packaging/run.py index c17ccfd..3afda5a 100644 --- a/Lib/packaging/run.py +++ b/Lib/packaging/run.py @@ -405,7 +405,6 @@ class Dispatcher: self.verbose = 1 self.dry_run = False self.help = False - self.script_name = 'pysetup' self.cmdclass = {} self.commands = [] self.command_options = {} diff --git a/Lib/packaging/tests/test_command_bdist_dumb.py b/Lib/packaging/tests/test_command_bdist_dumb.py index 41b0dd0..b235795 100644 --- a/Lib/packaging/tests/test_command_bdist_dumb.py +++ b/Lib/packaging/tests/test_command_bdist_dumb.py @@ -49,7 +49,6 @@ class BuildDumbTestCase(support.TempdirManager, 'py_modules': ['foo'], 'url': 'xxx', 'author': 'xxx', 'author_email': 'xxx'}) - dist.script_name = 'setup.py' os.chdir(pkg_dir) sys.argv[:] = ['setup.py'] diff --git a/Lib/packaging/tests/test_command_build_py.py b/Lib/packaging/tests/test_command_build_py.py index 49069f5..243a863 100644 --- a/Lib/packaging/tests/test_command_build_py.py +++ b/Lib/packaging/tests/test_command_build_py.py @@ -33,9 +33,7 @@ class BuildPyTestCase(support.TempdirManager, dist = Distribution({"packages": ["pkg"], "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( force=False, build_lib=destination, @@ -89,8 +87,6 @@ class BuildPyTestCase(support.TempdirManager, dist = Distribution({"packages": ["pkg"], "package_dir": sources, "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.parse_command_line() diff --git a/Lib/packaging/tests/test_command_install_dist.py b/Lib/packaging/tests/test_command_install_dist.py index 1974a2f..7821a3a 100644 --- a/Lib/packaging/tests/test_command_install_dist.py +++ b/Lib/packaging/tests/test_command_install_dist.py @@ -30,8 +30,6 @@ class InstallTestCase(support.TempdirManager, destination = os.path.join(builddir, "installation") 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( build_base=builddir, build_lib=os.path.join(builddir, "lib"), diff --git a/Lib/packaging/tests/test_command_install_lib.py b/Lib/packaging/tests/test_command_install_lib.py index 96749e3..b46f3bd 100644 --- a/Lib/packaging/tests/test_command_install_lib.py +++ b/Lib/packaging/tests/test_command_install_lib.py @@ -65,7 +65,6 @@ class InstallLibTestCase(support.TempdirManager, self.write_file(f, '# python package') cmd.distribution.ext_modules = [Extension('foo', ['xxx'])] cmd.distribution.packages = [pkg_dir] - cmd.distribution.script_name = 'setup.py' # make sure the build_lib is set the temp dir build_dir = os.path.split(pkg_dir)[0] @@ -86,7 +85,6 @@ class InstallLibTestCase(support.TempdirManager, self.write_file(f, '# python package') cmd.distribution.ext_modules = [Extension('foo', ['xxx'])] cmd.distribution.packages = [pkg_dir] - cmd.distribution.script_name = 'setup.py' # get_input should return 2 elements self.assertEqual(len(cmd.get_inputs()), 2) diff --git a/Lib/packaging/tests/test_command_sdist.py b/Lib/packaging/tests/test_command_sdist.py index 7be349f..bcaa630 100644 --- a/Lib/packaging/tests/test_command_sdist.py +++ b/Lib/packaging/tests/test_command_sdist.py @@ -24,12 +24,6 @@ from packaging.util import find_executable from packaging.tests import support from shutil import get_archive_formats -SETUP_PY = """ -from packaging.core import setup -import somecode - -setup(name='fake') -""" MANIFEST = """\ # file GENERATED by packaging, do NOT edit @@ -57,8 +51,6 @@ class SDistTestCase(support.TempdirManager, restore_environ = ['HOME'] def setUp(self): - # PyPIRCCommandTestCase creates a temp dir already - # and put it in self.tmp_dir super(SDistTestCase, self).setUp() self.tmp_dir = self.mkdtemp() os.environ['HOME'] = self.tmp_dir @@ -69,7 +61,6 @@ class SDistTestCase(support.TempdirManager, # a package, and a README self.write_file((self.tmp_dir, 'README'), 'xxx') self.write_file((self.tmp_dir, 'somecode', '__init__.py'), '#') - self.write_file((self.tmp_dir, 'setup.py'), SETUP_PY) os.chdir(self.tmp_dir) def tearDown(self): @@ -84,7 +75,6 @@ class SDistTestCase(support.TempdirManager, 'url': 'xxx', 'author': 'xxx', 'author_email': 'xxx'} dist = Distribution(metadata) - dist.script_name = 'setup.py' dist.packages = ['somecode'] dist.include_package_data = True cmd = sdist(dist) |