This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9547

hghave: update the check for virtualenv
ClosedPublic

Authored by mharbison72 on Dec 8 2020, 11:38 PM.

Details

Reviewers
spectral
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1b5e0d0bdb05: hghave: update the check for virtualenv
Summary

This started as hghave --test-features failing on Windows in test-hghave.t.
IDK how this worked, as neither my Linux nor Windows machines have the old
attribute with virtualenv 20.2.2, even on py2. I think this was noticed
recently because 357d8415aa27 mentioned an AttributeError, and mitigated by
making this py2 only. But as mentioned, this is also a problem on py2 (where
the failure was observed).

When I got this working by removing the attribute reference, the command in the
test failed because the --no-site-package argument was removed some time ago.
Therefore, this backs out 357d8415aa27 and references a known good attribute
(which was done to suppress the warning about an unused import) that also
ensures the command does not need the argument. Since there appears to be
(minor) broken stuff on py3, manually apply the no-py3 guard that was backed
out of the check itself.

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

mharbison72 created this revision.Dec 8 2020, 11:38 PM
spectral accepted this revision.Dec 9 2020, 5:19 PM
spectral added a subscriber: spectral.

Seems fine. ACTIVATE_SH is still in there on the version I have on my Debian Testing machine (15.1.0+ds-3 according to the dpkg system, 15.1.0 according to virtualenv.version). Not sure when it was removed, but it's not really relevant. :)

pulkit accepted this revision.Dec 10 2020, 3:43 AM
This revision is now accepted and ready to land.Dec 10 2020, 3:43 AM
mharbison72 added a commit: rHG1b5e0d0bdb05: hghave: update the check for virtualenv.Dec 10 2020, 4:42 AM
Closed by commit rHG1b5e0d0bdb05: hghave: update the check for virtualenv (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/hghave.py (15 lines)
Mtests/test-install.t (9 lines)

Diff 24168

tests/hghave.py

import ensurepip import ensurepip
ensurepip.bootstrap ensurepip.bootstrap
return True return True
except ImportError: except ImportError:
return False return False
@check("py2virtualenv", "Python2 virtualenv support") @check("virtualenv", "virtualenv support")
def has_py2virtualenv(): def has_virtualenv():
if sys.version_info[0] != 2:
return False
try: try:
import virtualenv import virtualenv
virtualenv.ACTIVATE_SH # --no-site-package became the default in 1.7 (Nov 2011), and the
return True # argument was removed in 20.0 (Feb 2020). Rather than make the
except ImportError: # script complicated, just ignore ancient versions.
return int(virtualenv.__version__.split('.')[0]) > 1
except (AttributeError, ImportError, IndexError):
return False return False
@check("fsmonitor", "running tests with fsmonitor") @check("fsmonitor", "running tests with fsmonitor")
def has_fsmonitor(): def has_fsmonitor():
return 'HGFSMONITOR_TESTS' in os.environ return 'HGFSMONITOR_TESTS' in os.environ

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 py2virtualenv #if virtualenv no-py3
Note: --no-site-packages is deprecated, but some places have an Note: --no-site-packages is the default for all versions enabled by hghave
ancient virtualenv from their linux distro or similar and it's not yet
the default for them.
$ "$PYTHON" -m virtualenv --no-site-packages --never-download installenv >> pip.log $ "$PYTHON" -m virtualenv --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 (?)
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
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 (?)
DEPRECATION: Python 2.7 reached the end of its life on January 1st, 2020. Please upgrade your Python as Python 2.7 is no longer maintained. pip 21.0 will drop support for Python 2.7 in January 2021. More details about Python 2 support in pip can be found at https://pip.pypa.io/en/latest/development/release-process/#python-2-support pip 21.0 will remove support for this functionality. (?)
$ ./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)
checking Python implementation (*) (glob) checking Python implementation (*) (glob)
checking Python version (2.*) (glob) checking Python version (2.*) (glob)
checking Python lib (*)... (glob) checking Python lib (*)... (glob)
checking Python security support (*) (glob) checking Python security support (*) (glob)
TLS 1.2 not supported by Python install; network connections lack modern security (?) TLS 1.2 not supported by Python install; network connections lack modern security (?)