Commit 52928dfe authored by PJ Eby's avatar PJ Eby

Fix a problem using bdist_egg with non-setuptools distributions.

--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041076
parent 8a4d2f4e
...@@ -201,9 +201,8 @@ class bdist_egg(Command): ...@@ -201,9 +201,8 @@ class bdist_egg(Command):
self.call_command('install_scripts', install_dir=script_dir) self.call_command('install_scripts', install_dir=script_dir)
self.write_requirements() self.write_requirements()
log.info("writing %s" % os.path.join(self.egg_info,'PKG-INFO')) log.info("writing %s" % os.path.join(self.egg_info,'PKG-INFO'))
if not self.dry_run: if not self.dry_run:
metadata = self.distribution.metadata metadata = self.distribution.metadata
metadata.version, oldver = self.egg_version, metadata.version metadata.version, oldver = self.egg_version, metadata.version
...@@ -233,9 +232,7 @@ class bdist_egg(Command): ...@@ -233,9 +232,7 @@ class bdist_egg(Command):
if os.path.exists(os.path.join(self.egg_info,'depends.txt')): if os.path.exists(os.path.join(self.egg_info,'depends.txt')):
log.warn( log.warn(
"WARNING: 'depends.txt' will not be used by setuptools 0.6!" "WARNING: 'depends.txt' will not be used by setuptools 0.6!\n"
)
log.warn(
"Use the install_requires/extras_require setup() args instead." "Use the install_requires/extras_require setup() args instead."
) )
# Make the archive # Make the archive
...@@ -244,6 +241,9 @@ class bdist_egg(Command): ...@@ -244,6 +241,9 @@ class bdist_egg(Command):
if not self.keep_temp: if not self.keep_temp:
remove_tree(self.bdist_dir, dry_run=self.dry_run) remove_tree(self.bdist_dir, dry_run=self.dry_run)
getattr(self.distribution,'dist_files',[]).append(
('bdist_egg',get_python_version(),self.egg_output))
def tagged_version(self): def tagged_version(self):
version = self.distribution.get_version() version = self.distribution.get_version()
if self.tag_build: if self.tag_build:
......
...@@ -89,6 +89,7 @@ class Distribution(_Distribution): ...@@ -89,6 +89,7 @@ class Distribution(_Distribution):
self.requires = [] self.requires = []
self.install_requires = [] self.install_requires = []
self.extras_require = {} self.extras_require = {}
self.dist_files = []
_Distribution.__init__(self,attrs) _Distribution.__init__(self,attrs)
if not have_package_data: if not have_package_data:
from setuptools.command.build_py import build_py from setuptools.command.build_py import build_py
...@@ -118,7 +119,6 @@ class Distribution(_Distribution): ...@@ -118,7 +119,6 @@ class Distribution(_Distribution):
def finalize_options(self): def finalize_options(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment