This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5088

hghave: add pyXY features for Python version numbers
ClosedPublic

Authored by indygreg on Oct 13 2018, 10:53 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1a6a01a21d6a: hghave: add pyXY features for Python version numbers
Summary

This will allow us to sniff for Python >= versions in tests.

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

indygreg created this revision.Oct 13 2018, 10:53 AM
indygreg updated this revision to Diff 12096.Oct 13 2018, 11:00 AM
durin42 added a subscriber: durin42.Oct 14 2018, 6:04 AM

Is there a way for me to specify something like "<=3.5" and "3.6<=" or similar?

indygreg added a comment.Oct 14 2018, 6:10 PM
In D5088#76278, @durin42 wrote:

Is there a way for me to specify something like "<=3.5" and "3.6<=" or similar?

Adding no- to the capability name will invert the condition. e.g. 3.5 will test false for no-py27 and no-py35 and true for no-py36 and no-py37.

If that is too confusing (I can make an argument it is), we could add a 2nd hghave series for the <= check. Say pymax27, pymax36 etc.

durin42 added a comment.Oct 15 2018, 1:25 AM
In D5088#76414, @indygreg wrote:
In D5088#76278, @durin42 wrote:

Is there a way for me to specify something like "<=3.5" and "3.6<=" or similar?

Adding no- to the capability name will invert the condition. e.g. 3.5 will test false for no-py27 and no-py35 and true for no-py36 and no-py37.
If that is too confusing (I can make an argument it is), we could add a 2nd hghave series for the <= check. Say pymax27, pymax36 etc.

Ah, so I could do (no-py27 no-py35 !) I suppose. Doesn't help with the other half, but it's still only three lines...

I'm not opposed to the patch, but I'm a little wary of it - so far we only have one use case and I already worked around that with an (re) line instead.

indygreg added a comment.Oct 15 2018, 3:28 AM
In D5088#76415, @durin42 wrote:

Ah, so I could do (no-py27 no-py35 !) I suppose. Doesn't help with the other half, but it's still only three lines...

(no-py27 no-py35 !) would be "<2.7 & < 3.5", which would only be true for <=2.6. You'd want no-py35 to say "Python 2.7 only" for example.

I'm not opposed to the patch, but I'm a little wary of it - so far we only have one use case and I already worked around that with an (re) line instead.

Explicit annotation of expected differences in behavior is better than e.g. a (re). I'm willing to be that (re) survives long after we drop support for Python 3.6 in several years...

durin42 added a comment.Jan 29 2019, 3:13 PM

I still don't love this, but I'm landing it to make forward progress on 3.7. :/

Closed by commit rHG1a6a01a21d6a: hghave: add pyXY features for Python version numbers (authored by indygreg). · Explain WhyJan 29 2019, 3:15 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/hghave.py (7 lines)

Diff 13552

tests/hghave.py

path = '%s/../contrib/packaging/debian/control' % os.environ['TESTDIR'] path = '%s/../contrib/packaging/debian/control' % os.environ['TESTDIR']
return matchoutput('dpkg-checkbuilddeps %s' % path, br'') return matchoutput('dpkg-checkbuilddeps %s' % path, br'')
@check("demandimport", "demandimport enabled") @check("demandimport", "demandimport enabled")
def has_demandimport(): def has_demandimport():
# chg disables demandimport intentionally for performance wins. # chg disables demandimport intentionally for performance wins.
return ((not has_chg()) and os.environ.get('HGDEMANDIMPORT') != 'disable') return ((not has_chg()) and os.environ.get('HGDEMANDIMPORT') != 'disable')
@checkvers("py", "Python >= %s", (2.7, 3.5, 3.6, 3.7, 3.8, 3.9))
def has_python_range(v):
major, minor = v.split('.')[0:2]
py_major, py_minor = sys.version_info.major, sys.version_info.minor
return (py_major, py_minor) >= (int(major), int(minor))
@check("py3", "running with Python 3.x") @check("py3", "running with Python 3.x")
def has_py3(): def has_py3():
return 3 == sys.version_info[0] return 3 == sys.version_info[0]
@check("py3exe", "a Python 3.x interpreter is available") @check("py3exe", "a Python 3.x interpreter is available")
def has_python3exe(): def has_python3exe():
return matchoutput('python3 -V', br'^Python 3.(5|6|7|8|9)') return matchoutput('python3 -V', br'^Python 3.(5|6|7|8|9)')