Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1662819 - Refactor virtualenv script path locating logic r=mhentges,froydnj

Browse Source 
The ability to get the path to the Python executable from a given `virtualenv` location is generally useful outside the context of all the extra stuff a `VirtualenvManager` provides, so refactor it out into a lighter-weight helper class.

Differential Revision: https://phabricator.services.mozilla.com/D89175
This commit is contained in:
Ricky Stewart 2020-09-02 18:52:58 +00:00
parent 4c6985333a
commit 792b74bafb
1 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
python/mozbuild/mozbuild/virtualenv.py
View File

@ -65,7 +65,33 @@ def ensure_text(s, encoding='utf-8'):
raise TypeError("not expecting type '%s'" % type(s))
class VirtualenvManager(object):
class VirtualenvHelper(object):
"""Contains basic logic for getting information about virtualenvs."""
def __init__(self, virtualenv_path):
self.virtualenv_root = virtualenv_path
@property
def bin_path(self):
# virtualenv.py provides a similar API via path_locations(). However,
# we have a bit of a chicken-and-egg problem and can't reliably
# import virtualenv. The functionality is trivial, so just implement
# it here.
if IS_CYGWIN or IS_NATIVE_WIN:
return os.path.join(self.virtualenv_root, 'Scripts')
return os.path.join(self.virtualenv_root, 'bin')
@property
def python_path(self):
binary = 'python'
if sys.platform in ('win32', 'cygwin'):
binary += '.exe'
return os.path.join(self.bin_path, binary)
class VirtualenvManager(VirtualenvHelper):
"""Contains logic for managing virtualenvs for building the tree."""
def __init__(
@ -76,10 +102,11 @@ class VirtualenvManager(object):
Each manager is associated with a source directory, a path where you
want the virtualenv to be created, and a handle to write output to.
"""
super(VirtualenvManager, self).__init__(virtualenv_path)
assert os.path.isabs(
manifest_path), "manifest_path must be an absolute path: %s" % (manifest_path)
self.topsrcdir = topsrcdir
self.virtualenv_root = virtualenv_path
# Record the Python executable that was used to create the Virtualenv
# so we can check this against sys.executable when verifying the
@ -101,25 +128,6 @@ class VirtualenvManager(object):
return os.path.join(self.topsrcdir, 'third_party', 'python',
'virtualenv', 'virtualenv.py')
@property
def bin_path(self):
# virtualenv.py provides a similar API via path_locations(). However,
# we have a bit of a chicken-and-egg problem and can't reliably
# import virtualenv. The functionality is trivial, so just implement
# it here.
if IS_CYGWIN or IS_NATIVE_WIN:
return os.path.join(self.virtualenv_root, 'Scripts')
return os.path.join(self.virtualenv_root, 'bin')
@property
def python_path(self):
binary = 'python'
if sys.platform in ('win32', 'cygwin'):
binary += '.exe'
return os.path.join(self.bin_path, binary)
@property
def version_info(self):
return eval(subprocess.check_output([