Skip to content

Commit

Permalink
Merge pull request #1419 from github/rasmuswl/poetry-no-local-venv
Browse files Browse the repository at this point in the history
python-setup: Don't allow Poetry to make venv in project
  • Loading branch information
RasmusWL authored Dec 6, 2022
2 parents 1e8d3b8 + 3b0a2f6 commit 44ef9d9
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## [UNRELEASED]

- Add a step that tries to upload a SARIF file for the workflow run when that workflow run fails. This will help better surface failed code scanning workflow runs. [#1393](https://github.com/github/codeql-action/pull/1393)
- Python automatic dependency installation will no longer consider dependecy code installed in venv as user-written, for projects using Poetry that specify `virtualenvs.in-project = true` in their `poetry.toml`. [#1419](https://github.com/github/codeql-action/pull/1419).

## 2.1.35 - 01 Dec 2022

Expand Down
15 changes: 11 additions & 4 deletions python-setup/auto_install_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,17 @@ def _check_output(command, extra_env={}):

def install_packages_with_poetry():

# To handle poetry 1.2, which started to use keyring interaction MUCH more, we need
# add a workaround. See
# https://github.com/python-poetry/poetry/issues/2692#issuecomment-1235683370
extra_poetry_env = {"PYTHON_KEYRING_BACKEND": "keyring.backends.null.Keyring"}
extra_poetry_env = {
# To handle poetry 1.2, which started to use keyring interaction MUCH more, we need
# add a workaround. See
# https://github.com/python-poetry/poetry/issues/2692#issuecomment-1235683370
"PYTHON_KEYRING_BACKEND": "keyring.backends.null.Keyring",
# Projects that specify `virtualenvs.in-project = true` in their poetry.toml
# would get the venv created inside the repo directory, which would cause CodeQL
# to consider it as user-written code. We don't want this to happen. see
# https://python-poetry.org/docs/configuration/#virtualenvsin-project
"POETRY_VIRTUALENVS_IN_PROJECT": "False",
}

command = [sys.executable, '-m', 'poetry']
if sys.platform.startswith('win32'):
Expand Down
2 changes: 2 additions & 0 deletions python-setup/tests/poetry/requests-3/poetry.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[virtualenvs]
in-project = true

0 comments on commit 44ef9d9

Please sign in to comment.