This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9955

build: fake PEP440 versions
ClosedPublic

Authored by joerg.sonnenberger on Feb 4 2021, 5:19 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG866eb4d6bd9f: build: fake PEP440 versions
rHG45cabe0d9286: build: fake PEP440 versions
Summary

If the current version is not exactly a tag, use a local version
specifier to fix it up. PEP 440 uses the "+" separator and only allows
alphanumeric and dot, so use dot for further separations.

Old devel build: 5.7+155-a163cc36d06b
New devel build: 5.7+hg155.a163cc36d06b

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

joerg.sonnenberger edited the summary of this revision. (Show Details)Feb 12 2021, 9:22 AM
joerg.sonnenberger added a commit: rHG45cabe0d9286: build: fake PEP440 versions.Feb 12 2021, 9:36 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG45cabe0d9286: build: fake PEP440 versions (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.Feb 12 2021, 11:26 AM
martinvonz added inline comments.
setup.py
437–439

This patch broke test-check-format.t because these three lines fits on one line. I'll fix it in flight, but please check your setup.

martinvonz added inline comments.Feb 23 2021, 2:00 AM
setup.py
433–439

I don't know what the "hg" string above (line 422) signifies, but should it be here too?

Also, it seems that the code at https://www.mercurial-scm.org/repo/hg/file/866eb4d6bd9f/contrib/packaging/hgpackaging/util.py#l192 needs to be updated. Our Windows build failed because of that, so that's how I noticed. I'll probably send a patch tomorrow.

martinvonz added inline comments.Feb 23 2021, 12:04 PM
setup.py
433–439

Also, were the added .s in before %(latesttagdistance)s here intentional? If so, why?

ThomasKenny added a subscriber: ThomasKenny.Jan 31 2022, 10:44 AM

these tips would be much needed for the viewers. Those who wanted solution of this problem can have a look at bogusbraxtor where some discussions do take place. With its use everybody can improve their skills.

Revision Contents
Changeset List

PathPackages
Msetup.py (32 lines)

Diff 25608

setup.py

version = numerictags[-1] version = numerictags[-1]
if hgid.endswith('+'): # propagate the dirty status to the tag if hgid.endswith('+'): # propagate the dirty status to the tag
version += '+' version += '+'
else: # no tag found else: # no tag found
ltagcmd = ['parents', '--template', '{latesttag}'] ltagcmd = ['parents', '--template', '{latesttag}']
ltag = sysstr(hg.run(ltagcmd)) ltag = sysstr(hg.run(ltagcmd))
changessincecmd = ['log', '-T', 'x\n', '-r', "only(.,'%s')" % ltag] changessincecmd = ['log', '-T', 'x\n', '-r', "only(.,'%s')" % ltag]
changessince = len(hg.run(changessincecmd).splitlines()) changessince = len(hg.run(changessincecmd).splitlines())
version = '%s+%s-%s' % (ltag, changessince, hgid) version = '%s+hg%s.%s' % (ltag, changessince, hgid)
if version.endswith('+'): if version.endswith('+'):
version += time.strftime('%Y%m%d') version = version[:-1] + 'local' + time.strftime('%Y%m%d')
elif os.path.exists('.hg_archival.txt'): elif os.path.exists('.hg_archival.txt'):
kw = dict( kw = dict(
[[t.strip() for t in l.split(':', 1)] for l in open('.hg_archival.txt')] [[t.strip() for t in l.split(':', 1)] for l in open('.hg_archival.txt')]
) )
if 'tag' in kw: if 'tag' in kw:
version = kw['tag'] version = kw['tag']
elif 'latesttag' in kw: elif 'latesttag' in kw:
if 'changessincelatesttag' in kw: if 'changessincelatesttag' in kw:
version = '%(latesttag)s+%(changessincelatesttag)s-%(node).12s' % kw version = (
'%(latesttag)s+.%(changessincelatesttag)s.%(node).12s' % kw
)
else: else:
version = '%(latesttag)s+%(latesttagdistance)s-%(node).12s' % kw version = (
'%(latesttag)s+.%(latesttagdistance)s.%(node).12s' % kw
)
martinvonzUnsubmitted
Not Done

This patch broke test-check-format.t because these three lines fits on one line. I'll fix it in flight, but please check your setup.

martinvonz: This patch broke `test-check-format.t` because these three lines fits on one line. I'll fix it…
martinvonzUnsubmitted
Not Done

I don't know what the "hg" string above (line 422) signifies, but should it be here too?

Also, it seems that the code at https://www.mercurial-scm.org/repo/hg/file/866eb4d6bd9f/contrib/packaging/hgpackaging/util.py#l192 needs to be updated. Our Windows build failed because of that, so that's how I noticed. I'll probably send a patch tomorrow.

martinvonz: I don't know what the "hg" string above (line 422) signifies, but should it be here too? Also…
martinvonzUnsubmitted
Not Done

Also, were the added .s in before %(latesttagdistance)s here intentional? If so, why?

martinvonz: Also, were the added `.`s in before `%(latesttagdistance)s` here intentional? If so, why?
else: else:
version = kw.get('node', '')[:12] version = '0+' + kw.get('node', '')[:12]
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',
b''.join( b''.join(
[ [
b'# this file is autogenerated by setup.py\n' b'# this file is autogenerated by setup.py\n'
b'version = b"%s"\n' % versionb, b'version = b"%s"\n' % versionb,
] ]
), ),
) )
try:
oldpolicy = os.environ.get('HGMODULEPOLICY', None)
os.environ['HGMODULEPOLICY'] = 'py'
from mercurial import __version__
version = __version__.version
except ImportError:
version = b'unknown'
finally:
if oldpolicy is None:
del os.environ['HGMODULEPOLICY']
else:
os.environ['HGMODULEPOLICY'] = oldpolicy
class hgbuild(build): class hgbuild(build):
# Insert hgbuildmo first so that files in mercurial/locale/ are found # Insert hgbuildmo first so that files in mercurial/locale/ are found
# when build_py is run next. # when build_py is run next.
sub_commands = [('build_mo', None)] + build.sub_commands sub_commands = [('build_mo', None)] + build.sub_commands
class hgbuildmo(build): class hgbuildmo(build):
packagedata[packagename] = list(filter(ordinarypath, files)) packagedata[packagename] = list(filter(ordinarypath, files))
datafiles = [] datafiles = []
# distutils expects version to be str/unicode. Converting it to # distutils expects version to be str/unicode. Converting it to
# unicode on Python 2 still works because it won't contain any # unicode on Python 2 still works because it won't contain any
# non-ascii bytes and will be implicitly converted back to bytes # non-ascii bytes and will be implicitly converted back to bytes
# when operated on. # when operated on.
assert isinstance(version, bytes) assert isinstance(version, str)
setupversion = version.decode('ascii') setupversion = version
extra = {} extra = {}
py2exepackages = [ py2exepackages = [
'hgdemandimport', 'hgdemandimport',
'hgext3rd', 'hgext3rd',
'hgext', 'hgext',
'email', 'email',