( )⚙ D8812 tests: virtualenv is only used on py2, rename and conditionalize

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8812

tests: virtualenv is only used on py2, rename and conditionalize
ClosedPublic

Authored by spectral on Jul 24 2020, 6:24 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG357d8415aa27: tests: virtualenv is only used on py2, rename and conditionalize
Summary

If I have I have the Debian python3-virtualenv package installed on my
machine, the import succeeds but then I receive an AttributeError because the
package is essentially completely different between py2 and py3, and
test-hghave fails.

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.

Revision Contents
Changeset List

PathPackages
Mtests/hghave.py (7 lines)
Mtests/test-install.t (2 lines)

Diff 22116

tests/hghave.py

import ensurepip import ensurepip
ensurepip.bootstrap ensurepip.bootstrap
return True return True
except ImportError: except ImportError:
return False return False
@check("virtualenv", "Python virtualenv support") @check("py2virtualenv", "Python2 virtualenv support")
def has_virtualenv(): def has_py2virtualenv():
if sys.version_info[0] != 2:
return False
try: try:
import virtualenv import virtualenv
virtualenv.ACTIVATE_SH virtualenv.ACTIVATE_SH
return True return True
except ImportError: except ImportError:
return False return False

tests/test-install.t

checking "re2" regexp engine \((available|missing)\) (re) checking "re2" regexp engine \((available|missing)\) (re)
checking templates ($TESTTMP/installenv/*/site-packages/mercurial/templates)... (glob) checking templates ($TESTTMP/installenv/*/site-packages/mercurial/templates)... (glob)
checking default template ($TESTTMP/installenv/*/site-packages/mercurial/templates/map-cmdline.default) (glob) checking default template ($TESTTMP/installenv/*/site-packages/mercurial/templates/map-cmdline.default) (glob)
checking commit editor... (*) (glob) checking commit editor... (*) (glob)
checking username (test) checking username (test)
no problems detected no problems detected
#endif #endif
#if no-py3 virtualenv #if py2virtualenv
Note: --no-site-packages is deprecated, but some places have an Note: --no-site-packages is deprecated, but some places have an
ancient virtualenv from their linux distro or similar and it's not yet ancient virtualenv from their linux distro or similar and it's not yet
the default for them. the default for them.
$ "$PYTHON" -m virtualenv --no-site-packages --never-download installenv >> pip.log $ "$PYTHON" -m virtualenv --no-site-packages --never-download installenv >> pip.log
DEPRECATION: Python 2.7 will reach the end of its life on January 1st, 2020. Please upgrade your Python as Python 2.7 won't be maintained after that date. A future version of pip will drop support for Python 2.7. (?) DEPRECATION: Python 2.7 will reach the end of its life on January 1st, 2020. Please upgrade your Python as Python 2.7 won't be maintained after that date. A future version of pip will drop support for Python 2.7. (?)
DEPRECATION: Python 2.7 will reach the end of its life on January 1st, 2020. Please upgrade your Python as Python 2.7 won't be maintained after that date. A future version of pip will drop support for Python 2.7. More details about Python 2 support in pip, can be found at https://pip.pypa.io/en/latest/development/release-process/#python-2-support (?) DEPRECATION: Python 2.7 will reach the end of its life on January 1st, 2020. Please upgrade your Python as Python 2.7 won't be maintained after that date. A future version of pip will drop support for Python 2.7. More details about Python 2 support in pip, can be found at https://pip.pypa.io/en/latest/development/release-process/#python-2-support (?)