diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2021-01-16 22:05:43 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2021-01-16 22:08:58 -0500 |
| commit | 5156278555fa20234db59f81097bee8cd7b5aaf4 (patch) | |
| tree | c9adb7a5707b193023a7684d4ca3f9ad32900192 /setuptools/command/egg_info.py | |
| parent | dc051ceb9071b7bc93fb8a3eaa8afc3ad57d5490 (diff) | |
| download | python-setuptools-git-5156278555fa20234db59f81097bee8cd7b5aaf4.tar.gz | |
Revert "Merge pull request #2533 from pypa/fix/2529"
This reverts commit ef457b2e4eb215ab9d730afbd61a10ed3b118d3c, reversing
changes made to d2b1f7ebd6ebd57b4a50bc6660e93b31129bacb4.
Diffstat (limited to 'setuptools/command/egg_info.py')
| -rw-r--r-- | setuptools/command/egg_info.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index bb472036..1f120b67 100644 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -131,12 +131,10 @@ class InfoCommon: egg_info may be called more than once for a distribution, in which case the version string already contains all tags. """ - # Remove the tags if they exist. The tags maybe have been normalized - # (e.g. turning .dev into .dev0) so we can't just compare strings - base_version = parse_version(version).base_version - - # Add the tags - return base_version + self.vtags + return ( + version if self.vtags and version.endswith(self.vtags) + else version + self.vtags + ) def tags(self): version = '' |