This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10502

packaging: extract pre-computed version when running from plain tarball
ClosedPublic

Authored by joerg.sonnenberger on Apr 20 2021, 2:36 PM.

Details

Reviewers
marmoute
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8d2b62d716b0: packaging: extract pre-computed version when running from plain tarball
Summary

The tarballs created by setup.py are not including the usual archive
markers that hg archive leaves, so the rewrite of the version number
computation actually left the empty version string around. This meant
that installations from PyPI would use 0.0.0 as version string.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

joerg.sonnenberger edited the summary of this revision. (Show Details)Apr 20 2021, 5:18 PM
marmoute accepted this revision.Apr 20 2021, 5:23 PM
marmoute added a subscriber: marmoute.
marmoute added inline comments.
setup.py
440–442

This looks fine, but maybe a bit fragile. We could simply run the python code and read the variable, could we not ?

joerg.sonnenberger added inline comments.Apr 20 2021, 8:09 PM
setup.py
440–442

I remember that having its own error case. Note that we wrote the exact content a few lines later here.

marmoute added a comment.EditedApr 21 2021, 5:25 AM

<deleted-comment>

Alphare accepted this revision.Apr 21 2021, 8:17 AM
This revision is now accepted and ready to land.Apr 21 2021, 8:17 AM
pulkit accepted this revision.Apr 28 2021, 6:37 AM

Revision Contents
Changeset List

PathPackages
Msetup.py (3 lines)

Diff 27149

setup.py

if 'changessincelatesttag' in kw: if 'changessincelatesttag' in kw:
version = ( version = (
'%(latesttag)s+hg%(changessincelatesttag)s.%(node).12s' % kw '%(latesttag)s+hg%(changessincelatesttag)s.%(node).12s' % kw
) )
else: else:
version = '%(latesttag)s+hg%(latesttagdistance)s.%(node).12s' % kw version = '%(latesttag)s+hg%(latesttagdistance)s.%(node).12s' % kw
else: else:
version = '0+hg' + kw.get('node', '')[:12] version = '0+hg' + kw.get('node', '')[:12]
elif os.path.exists('mercurial/__version__.py'):
data = open('mercurial/__version__.py').read()
version = re.search('version = b"(.*)"', data).group(1)
marmouteUnsubmitted
Not Done

This looks fine, but maybe a bit fragile. We could simply run the python code and read the variable, could we not ?

marmoute: This looks fine, but maybe a bit fragile. We could simply run the python code and read the…
joerg.sonnenbergerAuthorUnsubmitted
Done

I remember that having its own error case. Note that we wrote the exact content a few lines later here.

joerg.sonnenberger: I remember that having its own error case. Note that we wrote the exact content a few lines…
if version: if version:
versionb = version versionb = version
if not isinstance(versionb, bytes): if not isinstance(versionb, bytes):
versionb = versionb.encode('ascii') versionb = versionb.encode('ascii')
write_if_changed( write_if_changed(
'mercurial/__version__.py', 'mercurial/__version__.py',