billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Python refactoring.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-23 14:30:51 +00:00
parent 5b8e6718cb
commit 94e0b4f99d
1 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
ognibuild/resolver/apt.py
View file

@ -119,30 +119,21 @@ def python_spec_to_apt_rels(pkg_name, specs):
return rels return rels
def get_package_for_python_package(apt_mgr, package, python_version, specs=None): def get_package_for_python_package(apt_mgr, package, python_version: Optional[str], specs=None):
pypy_regex = "/usr/lib/pypy/dist-packages/%s-.*.egg-info" % re.escape(package.replace("-", "_"))
cpython2_regex = "/usr/lib/python2\\.[0-9]/dist-packages/%s-.*.egg-info" % re.escape(package.replace("-", "_"))
cpython3_regex = "/usr/lib/python3/dist-packages/%s-.*.egg-info" % re.escape(package.replace("-", "_"))
if python_version == "pypy": if python_version == "pypy":
pkg_name = apt_mgr.get_package_for_paths( paths = [pypy_regex]
["/usr/lib/pypy/dist-packages/%s-.*.egg-info" % re.escape(package.replace("-", "_"))],
regex=True,
)
elif python_version == "cpython2": elif python_version == "cpython2":
pkg_name = apt_mgr.get_package_for_paths( paths = [cpython2_regex]
[
"/usr/lib/python2\\.[0-9]/dist-packages/%s-.*.egg-info"
% re.escape(package.replace("-", "_"))
],
regex=True,
)
elif python_version == "cpython3": elif python_version == "cpython3":
pkg_name = apt_mgr.get_package_for_paths( paths = [cpython3_regex]
[ elif python_version is None:
"/usr/lib/python3/dist-packages/%s-.*.egg-info" paths = [cpython3_regex, cpython2_regex, pypy_regex]
% re.escape(package.replace("-", "_"))
],
regex=True,
)
else: else:
raise NotImplementedError raise NotImplementedError('unsupported python version %d' % python_version)
pkg_name = apt_mgr.get_package_for_paths(paths, regex=True)
if pkg_name is None: if pkg_name is None:
return None return None
rels = python_spec_to_apt_rels(pkg_name, specs) rels = python_spec_to_apt_rels(pkg_name, specs)
@ -150,8 +141,7 @@ def get_package_for_python_package(apt_mgr, package, python_version, specs=None)
def get_package_for_python_module(apt_mgr, module, python_version, specs): def get_package_for_python_module(apt_mgr, module, python_version, specs):
if python_version == "cpython3": cpython3_regexes = [
paths = [
posixpath.join( posixpath.join(
"/usr/lib/python3/dist-packages", "/usr/lib/python3/dist-packages",
re.escape(module.replace(".", "/")), re.escape(module.replace(".", "/")),
@ -171,8 +161,7 @@ def get_package_for_python_module(apt_mgr, module, python_version, specs):
"/usr/lib/python3\\.[0-9]+/", re.escape(module.replace(".", "/")), "__init__.py" "/usr/lib/python3\\.[0-9]+/", re.escape(module.replace(".", "/")), "__init__.py"
), ),
] ]
elif python_version == "cpython2": cpython2_regexes = [
paths = [
posixpath.join( posixpath.join(
"/usr/lib/python2\\.[0-9]/dist-packages", "/usr/lib/python2\\.[0-9]/dist-packages",
re.escape(module.replace(".", "/")), re.escape(module.replace(".", "/")),
@ -187,8 +176,7 @@ def get_package_for_python_module(apt_mgr, module, python_version, specs):
re.escape(module.replace(".", "/")) + ".so", re.escape(module.replace(".", "/")) + ".so",
), ),
] ]
elif python_version == "pypy": pypy_regexes = [
paths = [
posixpath.join( posixpath.join(
"/usr/lib/pypy/dist-packages", re.escape(module.replace(".", "/")), "__init__.py" "/usr/lib/pypy/dist-packages", re.escape(module.replace(".", "/")), "__init__.py"
), ),
@ -200,6 +188,14 @@ def get_package_for_python_module(apt_mgr, module, python_version, specs):
re.escape(module.replace(".", "/")) + "\\.pypy-.*\\.so", re.escape(module.replace(".", "/")) + "\\.pypy-.*\\.so",
), ),
] ]
if python_version == "cpython3":
paths = cpython3_regexes
elif python_version == "cpython2":
paths = cpython2_regexes
elif python_version == "pypy":
paths = pypy_regexes
elif python_version is None:
paths = cpython3_regexes + cpython2_regexes + pypy_regexes
else: else:
raise AssertionError("unknown python version %r" % python_version) raise AssertionError("unknown python version %r" % python_version)
pkg_name = apt_mgr.get_package_for_paths(paths, regex=True) pkg_name = apt_mgr.get_package_for_paths(paths, regex=True)
@ -395,7 +391,6 @@ def resolve_sprockets_file_req(apt_mgr, req):
def resolve_java_class_req(apt_mgr, req): def resolve_java_class_req(apt_mgr, req):
# Unfortunately this only finds classes in jars installed on the host # Unfortunately this only finds classes in jars installed on the host
# system :( # system :(
# TODO(jelmer): Call in session
output = apt_mgr.session.check_output( output = apt_mgr.session.check_output(
["java-propose-classpath", "-c" + req.classname] ["java-propose-classpath", "-c" + req.classname]
) )