commit: 4d93a7a14a78684215b72d5ecf60c99521a790c9
Author: Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com>
AuthorDate: Tue Oct 31 03:01:28 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 11 02:55:29 2023 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4d93a7a1
sr.ht ci: install some missing packages
- pkg-config
- libpython
- pytest-xdist
- with psutil to auto-detect logical cores
Signed-off-by: Oskari Pirhonen <xxc3ncoredxx <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.builds/ci.yml | 4 ++--
.builds/setup-python.sh | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.builds/ci.yml b/.builds/ci.yml
index 0a4034e1cd..896840a3fc 100644
--- a/.builds/ci.yml
+++ b/.builds/ci.yml
@@ -21,11 +21,11 @@ tasks:
portage/.builds/setup-python.sh "${PYTHON_VERSIONS[@]}"
- setup-tests: |
- sudo apt-get install -y --no-install-recommends meson
+ sudo apt-get install -y --no-install-recommends meson pkg-config
for py in "${PYTHON_VERSIONS[@]}"; do
source ".venv-$py/bin/activate"
# setuptools needed for 3.12+ because of
https://github.com/mesonbuild/meson/issues/7702.
- pip install pytest setuptools
+ pip install pytest pytest-xdist[psutil] setuptools
printf "[binaries]\npython = '%s'\n" "$(command -v python)" \
| tee "/tmp/native-$py.ini"
meson setup --native-file "/tmp/native-$py.ini" "/tmp/build-$py"
portage
diff --git a/.builds/setup-python.sh b/.builds/setup-python.sh
index 72e63ad957..4099a02f06 100755
--- a/.builds/setup-python.sh
+++ b/.builds/setup-python.sh
@@ -9,8 +9,10 @@ install_versions=( "${install_versions[@]/#pythonpypy/pypy}" )
sudo apt-get install -y --no-install-recommends \
python-is-python3 \
+ python3-dev \
python3-venv \
"${install_versions[@]}" \
+ "${install_versions[@]/%/-dev}" \
"${install_versions[@]/%/-venv}"
for py in "$@"; do
