Skip to content

Commit

Permalink
python-setup: Handle poetry virtualenvs.options.no-pip = true
Browse files Browse the repository at this point in the history
Fixes #1425
  • Loading branch information
RasmusWL committed Dec 15, 2022
1 parent 0a3f985 commit 00e43e7
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## [UNRELEASED]

No user facing changes.
- Python automatic dependency installation will no longer fail for projects using Poetry that specify `virtualenvs.options.no-pip = true` in their `poetry.toml`. [#1431](https://github.com/github/codeql-action/pull/1431).

## 2.1.37 - 14 Dec 2022

Expand Down
28 changes: 28 additions & 0 deletions python-setup/find_site_packages.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
"""
Print the path to the site-packages directory for the current Python environment.
"""

try:
import pip
import os
print(os.path.dirname(os.path.dirname(pip.__file__)))
except ImportError:
import sys
print("could not import pip", file=sys.stderr)
# if you use poetry with `virtualenvs.options.no-pip = true` you might end up with a
# virtualenv without pip, so the above trick doesn't actually work. See
# https://python-poetry.org/docs/configuration/#virtualenvsoptionsno-pip
#
# A possible option is to install `pip` into the virtualenv created by poetry
# (`poetry add pip`), but it turns out that doesn't always work :( for the test
# poetry/requests-3, I was not allowed to install pip! So I did not pursue this
# option further.
#
# Instead, local testing shows that first entry of `site.getsitepackages()` has the
# right path, whereas `site.getusersitepackages()` is about the system python (very
# confusing).
#
# We can't use the environment variable POETRY_VIRTUALENVS_OPTIONS_NO_PIP because it
# does not work, see https://github.com/python-poetry/poetry/issues/5906
import site
print(site.getsitepackages()[0])
3 changes: 1 addition & 2 deletions python-setup/tests/from_python_exe.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ def get_details(path_to_python_exe: str) -> Tuple[str, str]:
import_path = subprocess.check_output(
[
path_to_python_exe,
"-c",
"import os; import pip; print(os.path.dirname(os.path.dirname(pip.__file__)))",
os.path.join(os.path.dirname(__file__), "find_site_packages.py")
],
stdin=subprocess.DEVNULL,
)
Expand Down
3 changes: 3 additions & 0 deletions python-setup/tests/poetry/requests-3/poetry.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[virtualenvs]
in-project = true

[virtualenvs.options]
no-pip = true
5 changes: 3 additions & 2 deletions src/analyze.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ async function setupPythonExtractor(logger: Logger) {
return;
}

const scriptsFolder = path.resolve(__dirname, "../python-setup");

let output = "";
const options = {
listeners: {
Expand All @@ -100,8 +102,7 @@ async function setupPythonExtractor(logger: Logger) {
await new toolrunner.ToolRunner(
codeqlPython,
[
"-c",
"import os; import pip; print(os.path.dirname(os.path.dirname(pip.__file__)))",
path.join(scriptsFolder, "find_site_packages.py"),
],
options
).exec();
Expand Down

0 comments on commit 00e43e7

Please sign in to comment.