diff --git a/qa/admin/other-packages/manifest b/qa/admin/other-packages/manifest index 7c284b092cd..21cb5f6fdae 100644 --- a/qa/admin/other-packages/manifest +++ b/qa/admin/other-packages/manifest @@ -460,6 +460,17 @@ S_pkg? /usr/lib/python3.*/*-packages/setuptools/dist.py [library/python/setuptoo slackpkg? /usr/lib*/python*/*-packages/setuptools/dist.py [python-setuptools] pacman? /usr/lib/python3.*/*-packages/setuptools/dist.py [extra/python-setuptools] brew? /usr/local/lib/python3.*/*-packages/setuptools/dist.py [pip3(setuptools)] +# -- python pip +dpkg? /usr/bin/pip3 [python3-pip] +rpm? /usr/bin/pip3 [python3-pip or python3[0-9]*-pip] +emerge? /usr/bin/pip3 [dev-python/pip] +pkgin? /usr/pkg/bin/pip3 [py3[0-9]*-pip] +pkg_add? /usr/local/bin/pip3 [py3-pip] +F_pkg? /usr/local/bin/pip3 [py3[0-9]*-pip] +S_pkg? /usr/bin/pip3 [library/python/pip-[0-9][0-9]*] +slackpkg? /usr/bin/pip3 [python-pip] +pacman? /usr/bin/pip3 [extra/python-pip] +brew? /usr/local/bin/pip3 [pip3(pip)] # -- python libvirt and lxml for libvirt PMDA dpkg? /usr/lib/python3/*-packages/libvirt.py [python3-libvirt (build optional)] rpm? /usr/lib*/python3.*/*-packages/libvirt.py [libvirt-python3 or python3[0-9]*-libvirt python3[0-9]*-libvirt-python (build optional)] diff --git a/qa/admin/package-lists/CentOS+Stream10+x86_64 b/qa/admin/package-lists/CentOS+Stream10+x86_64 index b211b0a585c..06d5022f828 100644 --- a/qa/admin/package-lists/CentOS+Stream10+x86_64 +++ b/qa/admin/package-lists/CentOS+Stream10+x86_64 @@ -103,6 +103,7 @@ python3-libs python3-libvirt python3-lxml python3-openpyxl +python3-pip python3-pandas python3-pillow python3-prometheus_client diff --git a/qa/admin/package-lists/CentOS+Stream8+x86_64 b/qa/admin/package-lists/CentOS+Stream8+x86_64 index fc665731819..6214aed89df 100644 --- a/qa/admin/package-lists/CentOS+Stream8+x86_64 +++ b/qa/admin/package-lists/CentOS+Stream8+x86_64 @@ -99,6 +99,7 @@ python3-libs python3-libvirt python3-lxml python3-openpyxl +python3-pip python3-pillow python3-prometheus_client python3-psycopg2 diff --git a/qa/admin/package-lists/CentOS+Stream9+x86_64 b/qa/admin/package-lists/CentOS+Stream9+x86_64 index 0bb261dc1ea..40aee62b9d8 100644 --- a/qa/admin/package-lists/CentOS+Stream9+x86_64 +++ b/qa/admin/package-lists/CentOS+Stream9+x86_64 @@ -104,6 +104,7 @@ python3-libs python3-libvirt python3-lxml python3-openpyxl +python3-pip python3-pillow python3-prometheus_client python3-psycopg2 diff --git a/qa/admin/package-lists/Debian+11+i686 b/qa/admin/package-lists/Debian+11+i686 index 22d6e7d78ed..609cf5c6d4f 100644 --- a/qa/admin/package-lists/Debian+11+i686 +++ b/qa/admin/package-lists/Debian+11+i686 @@ -107,6 +107,7 @@ python3-elasticsearch python3-libvirt python3-lxml python3-openpyxl +python3-pip python3-pil python3-prometheus-client python3-psycopg2 diff --git a/qa/admin/package-lists/Debian+11+x86_64 b/qa/admin/package-lists/Debian+11+x86_64 index 09c84659774..4a6f86fe664 100644 --- a/qa/admin/package-lists/Debian+11+x86_64 +++ b/qa/admin/package-lists/Debian+11+x86_64 @@ -112,6 +112,7 @@ python3-elasticsearch python3-libvirt python3-lxml python3-openpyxl +python3-pip python3-pil python3-prometheus-client python3-psycopg2 diff --git a/qa/admin/package-lists/Debian+12+aarch64 b/qa/admin/package-lists/Debian+12+aarch64 index 723e2e6520b..f7d5642f33c 100644 --- a/qa/admin/package-lists/Debian+12+aarch64 +++ b/qa/admin/package-lists/Debian+12+aarch64 @@ -112,6 +112,7 @@ python3-libvirt python3-lxml python3-minimal python3-openpyxl +python3-pip python3-pil python3-prometheus-client python3-psycopg2 diff --git a/qa/admin/package-lists/Debian+12+i686 b/qa/admin/package-lists/Debian+12+i686 index 785cc600ac6..cf12e6474d2 100644 --- a/qa/admin/package-lists/Debian+12+i686 +++ b/qa/admin/package-lists/Debian+12+i686 @@ -113,6 +113,7 @@ python3-libvirt python3-lxml python3-minimal python3-openpyxl +python3-pip python3-pandas python3-pil python3-prometheus-client diff --git a/qa/admin/package-lists/Debian+12+x86_64 b/qa/admin/package-lists/Debian+12+x86_64 index 1e0c3083653..d5071dd00e6 100644 --- a/qa/admin/package-lists/Debian+12+x86_64 +++ b/qa/admin/package-lists/Debian+12+x86_64 @@ -118,6 +118,7 @@ python3-libvirt python3-lxml python3-minimal python3-openpyxl +python3-pip python3-pandas python3-pil python3-prometheus-client diff --git a/qa/admin/package-lists/Debian+13+i686 b/qa/admin/package-lists/Debian+13+i686 index 8c2d252900c..e065ee72031 100644 --- a/qa/admin/package-lists/Debian+13+i686 +++ b/qa/admin/package-lists/Debian+13+i686 @@ -119,6 +119,7 @@ python3-elasticsearch python3-libvirt python3-lxml python3-openpyxl +python3-pip python3-pandas python3-pil python3-prometheus-client diff --git a/qa/admin/package-lists/Debian+13+x86_64 b/qa/admin/package-lists/Debian+13+x86_64 index 19aca6f48a6..30d1aa630c6 100644 --- a/qa/admin/package-lists/Debian+13+x86_64 +++ b/qa/admin/package-lists/Debian+13+x86_64 @@ -116,6 +116,7 @@ python3-elasticsearch python3-libvirt python3-lxml python3-openpyxl +python3-pip python3-pil python3-prometheus-client python3-psycopg2 diff --git a/qa/admin/package-lists/Ubuntu+18.04+i686 b/qa/admin/package-lists/Ubuntu+18.04+i686 index 31baaa95c54..4b9c3e9589c 100644 --- a/qa/admin/package-lists/Ubuntu+18.04+i686 +++ b/qa/admin/package-lists/Ubuntu+18.04+i686 @@ -107,6 +107,7 @@ python3-elasticsearch python3-libvirt python3-lxml python3-openpyxl +python3-pip python3-pil python3-prometheus-client python3-psycopg2 diff --git a/qa/admin/package-lists/Ubuntu+18.04+x86_64 b/qa/admin/package-lists/Ubuntu+18.04+x86_64 index 4a01849ad22..96073aa07a7 100644 --- a/qa/admin/package-lists/Ubuntu+18.04+x86_64 +++ b/qa/admin/package-lists/Ubuntu+18.04+x86_64 @@ -108,6 +108,7 @@ python3-elasticsearch python3-libvirt python3-lxml python3-openpyxl +python3-pip python3-pil python3-prometheus-client python3-psycopg2 diff --git a/qa/admin/package-lists/Ubuntu+20.04+x86_64 b/qa/admin/package-lists/Ubuntu+20.04+x86_64 index f030fc825c8..8004e2bfd5c 100644 --- a/qa/admin/package-lists/Ubuntu+20.04+x86_64 +++ b/qa/admin/package-lists/Ubuntu+20.04+x86_64 @@ -115,6 +115,7 @@ python3-libvirt python3-lxml python3-minimal python3-openpyxl +python3-pip python3-pandas python3-pil python3-prometheus-client diff --git a/qa/admin/package-lists/Ubuntu+22.04+x86_64 b/qa/admin/package-lists/Ubuntu+22.04+x86_64 index d0403303a18..7855a4f3a8f 100644 --- a/qa/admin/package-lists/Ubuntu+22.04+x86_64 +++ b/qa/admin/package-lists/Ubuntu+22.04+x86_64 @@ -116,6 +116,7 @@ python3-libvirt python3-lxml python3-minimal python3-openpyxl +python3-pip python3-pil python3-prometheus-client python3-psycopg2 diff --git a/qa/admin/package-lists/Ubuntu+24.04+x86_64 b/qa/admin/package-lists/Ubuntu+24.04+x86_64 index d99343e9c59..0da5f1382e0 100644 --- a/qa/admin/package-lists/Ubuntu+24.04+x86_64 +++ b/qa/admin/package-lists/Ubuntu+24.04+x86_64 @@ -118,6 +118,7 @@ python3-libvirt python3-lxml python3-minimal python3-openpyxl +python3-pip python3-pandas python3-pil python3-prometheus-client diff --git a/src/python/GNUmakefile b/src/python/GNUmakefile index a78ebcc4318..595e8c8a19b 100644 --- a/src/python/GNUmakefile +++ b/src/python/GNUmakefile @@ -65,7 +65,7 @@ build_python3: $(SETUP_PY) $(CFILES) touch build_python3 install_python3: build_python3 - export $(ENV); $(PYTHON3) $(SETUP_PY) install $(PY3_INSTALL_OPTS) + export $(ENV); $(PYTHON3) -m pip install --no-build-isolation --root="$${DIST_ROOT:-/}" --prefix=$(PYTHON_PREFIX) --record=$(TOPDIR)/python3-pcp.list . export $(ENV); $(PYTHON3_INSTALL) else build_python3: diff --git a/src/python/setup.py b/src/python/setup.py index 0f9def6cf27..12f3cf33427 100644 --- a/src/python/setup.py +++ b/src/python/setup.py @@ -19,8 +19,6 @@ # New way, modern setup mechanisms for pypi from setuptools import setup, find_packages, Extension -# To use a consistent encoding -from codecs import open from os import path # Get the long description from the README file