This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7228

tests: look for ensurepip before using venv
ClosedPublic

Authored by indygreg on Nov 5 2019, 2:44 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGca0cd0a13514: tests: look for ensurepip before using venv
Summary

Debian appears to cripple the venv module by default by
removing the associated ensurepip functionality. (The module
isn't present at all.) This caused test-install.t to fail when
using the Debian python3 unless the python3-venv package was
installed.

This commit introduces a new hghave requirement for detecting
ensurepip and makes the Python 3 install variant conditional on
its presence. This should make test-install.t pass when
using an incomplete Debian Python.

Diff Detail

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

Event Timeline

indygreg created this revision.Nov 5 2019, 2:44 AM
indygreg added a commit: rHGca0cd0a13514: tests: look for ensurepip before using venv.Nov 5 2019, 11:03 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGca0cd0a13514: tests: look for ensurepip before using venv (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/hghave.py (11 lines)
Mtests/test-install.t (5 lines)

Diff 17551

tests/hghave.py

return False return False
@check("devfull", "/dev/full special file") @check("devfull", "/dev/full special file")
def has_dev_full(): def has_dev_full():
return os.path.exists('/dev/full') return os.path.exists('/dev/full')
@check("ensurepip", "ensurepip module")
def has_ensurepip():
try:
import ensurepip
ensurepip.bootstrap
return True
except ImportError:
return False
@check("virtualenv", "Python virtualenv support") @check("virtualenv", "Python virtualenv support")
def has_virtualenv(): def has_virtualenv():
try: try:
import virtualenv import virtualenv
virtualenv.ACTIVATE_SH virtualenv.ACTIVATE_SH
return True return True
except ImportError: except ImportError:

tests/test-install.t

#endif #endif
Verify that Mercurial is installable with pip. Note that this MUST be Verify that Mercurial is installable with pip. Note that this MUST be
the last test in this file, because we do some nasty things to the the last test in this file, because we do some nasty things to the
shell environment in order to make the virtualenv work reliably. shell environment in order to make the virtualenv work reliably.
On Python 3, we use the venv module, which is part of the standard library. On Python 3, we use the venv module, which is part of the standard library.
But some Linux distros strip out this module's functionality involving pip,
so we have to look for the ensurepip module, which these distros strip out
completely.
On Python 2, we use the 3rd party virtualenv module, if available. On Python 2, we use the 3rd party virtualenv module, if available.
$ cd $TESTTMP $ cd $TESTTMP
$ unset PYTHONPATH $ unset PYTHONPATH
#if py3 #if py3 ensurepip
$ "$PYTHON" -m venv installenv >> pip.log $ "$PYTHON" -m venv installenv >> pip.log
Note: we use this weird path to run pip and hg to avoid platform differences, Note: we use this weird path to run pip and hg to avoid platform differences,
since it's bin on most platforms but Scripts on Windows. since it's bin on most platforms but Scripts on Windows.
$ ./installenv/*/pip install --no-index $TESTDIR/.. >> pip.log $ ./installenv/*/pip install --no-index $TESTDIR/.. >> pip.log
$ ./installenv/*/hg debuginstall || cat pip.log $ ./installenv/*/hg debuginstall || cat pip.log
checking encoding (ascii)... checking encoding (ascii)...
checking Python executable (*) (glob) checking Python executable (*) (glob)