Source distributions now always include a ``setup.cfg`` file that explicitly

sets ``egg_info`` options such that they produce an identical version number
to the source distribution's version number.  (Previously, the default
version number could be different due to the use of ``--tag-date``, or if
the version was overridden on the command line that built the source
distribution.)

(backport from trunk)

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4050703

setuptools.txt

@@ -2577,6 +2577,11 @@ Release Notes/Change History
  * Support ``extra_path`` option to ``setup()`` when ``install`` is run in
    backward-compatibility mode.
 
+ * Rewrite ``setup.cfg`` in ``sdist`` distributions to include any ``egg_info``
+   options that were set on the command line when ``sdist`` was run, so that
+   the building from the source distribution will create a package with an
+   identical version number (unless ``--tag-date`` is in effect).
+
 0.6b4
  * Fix ``register`` not obeying name/version set by ``egg_info`` command, if
    ``egg_info`` wasn't explicitly run first on the same command line.

setuptools/command/egg_info.py

@@ -39,7 +39,7 @@ class egg_info(Command):
 
 
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.egg_name = None
         self.egg_version = None
         self.egg_base = None
@@ -48,16 +48,16 @@ class egg_info(Command):
         self.tag_svn_revision = 0
         self.tag_date = 0
         self.broken_egg_info = False
-
-
-
-
-
-
-
-
-
-
+        self.vtags = None
+
+    def save_version_info(self, filename):
+        from setopt import edit_config
+        edit_config(
+            filename,
+            {'egg_info':
+                {'tag_svn_revision':0, 'tag_date': 0, 'tag_build': self.tags()}
+            }
+        )
 
 
 
@@ -82,6 +82,7 @@ class egg_info(Command):
 
     def finalize_options (self):
         self.egg_name = safe_name(self.distribution.get_name())
+        self.vtags = self.tags()
         self.egg_version = self.tagged_version()
 
         try:
@@ -120,7 +121,6 @@ class egg_info(Command):
             self.distribution._patched_dist = None
 
 
-
     def write_or_delete_file(self, what, filename, data, force=False):
         """Write `data` to `filename` or delete if empty
 
@@ -159,8 +159,8 @@ class egg_info(Command):
         if not self.dry_run:
             os.unlink(filename)
 
-
-
+    def tagged_version(self):
+        return safe_version(self.distribution.get_version() + self.vtags)
 
     def run(self):
         self.mkpath(self.egg_info)
@@ -170,8 +170,8 @@ class egg_info(Command):
             writer(self, ep.name, os.path.join(self.egg_info,ep.name))
         self.find_sources()
 
-    def tagged_version(self):
-        version = self.distribution.get_version()
+    def tags(self):
+        version = ''
         if self.tag_build:
             version+=self.tag_build
         if self.tag_svn_revision and (
@@ -179,7 +179,7 @@ class egg_info(Command):
         ):  version += '-r%s' % self.get_svn_revision()
         if self.tag_date:
             import time; version += time.strftime("-%Y%m%d")
-        return safe_version(version)
+        return version
 
     def get_svn_revision(self):
         revision = 0

setuptools/command/sdist.py

@@ -173,18 +173,18 @@ class sdist(_sdist):
             )
 
 
-
-
-
-
-
-
-
-
-
-
-
-
+    def make_release_tree(self, base_dir, files):
+        _sdist.make_release_tree(self, base_dir, files)
+
+        # Save any egg_info command line options used to create this sdist
+        dest = os.path.join(base_dir, 'setup.cfg')
+        if hasattr(os,'link') and os.path.exists(dest):
+            # unlink and re-copy, since it might be hard-linked, and
+            # we don't want to change the source version
+            os.unlink(dest)
+            self.copy_file('setup.cfg', dest)
+
+        self.get_finalized_command('egg_info').save_version_info(dest)