diff options
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | lib/portage/__init__.py | 3 | ||||
| -rw-r--r-- | tox.ini | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 09c944ba1..d4b960dc3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: - name: Install python dependencies run: | set -xe - sudo apt-get install -y --no-install-recommends libxslt-dev libxml2-dev zstd + sudo apt-get install -y --no-install-recommends libxslt-dev libxml2-dev libxml2-utils zstd python -VV python -m site python -m pip install --upgrade pip diff --git a/lib/portage/__init__.py b/lib/portage/__init__.py index 621b1d99f..178d724db 100644 --- a/lib/portage/__init__.py +++ b/lib/portage/__init__.py @@ -360,7 +360,8 @@ except (ImportError, OSError) as e: # END OF IMPORTS -- END OF IMPORTS -- END OF IMPORTS -- END OF IMPORTS -- END # =========================================================================== -_python_interpreter = os.path.realpath(sys.executable) +_python_interpreter = (sys.executable if os.environ.get("VIRTUAL_ENV") + else os.path.realpath(sys.executable)) _bin_path = PORTAGE_BIN_PATH _pym_path = PORTAGE_PYM_PATH _not_installed = os.path.isfile(os.path.join(PORTAGE_BASE_PATH, ".portage_not_installed")) @@ -22,4 +22,4 @@ setenv = commands = bash -c 'rm -rf build && PYTHONPATH=$PWD/lib:$PWD/repoman/lib pylint *' python -b -Wd setup.py test - python -b -Wd repoman/setup.py test + bash -c 'if python -c "import lxml.etree"; then python -b -Wd repoman/setup.py test; else echo "repoman tests skipped due to lxml breakage"; fi' |