summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--ci/containers/centos-stream-8.Dockerfile1
-rw-r--r--ci/containers/debian-10.Dockerfile1
-rw-r--r--ci/containers/debian-sid.Dockerfile1
-rw-r--r--ci/containers/fedora-34.Dockerfile1
-rw-r--r--ci/containers/fedora-35.Dockerfile1
-rw-r--r--ci/containers/fedora-rawhide.Dockerfile1
-rw-r--r--ci/containers/opensuse-leap-152.Dockerfile1
-rw-r--r--ci/containers/opensuse-tumbleweed.Dockerfile1
-rw-r--r--ci/containers/ubuntu-1804.Dockerfile1
-rw-r--r--ci/containers/ubuntu-2004.Dockerfile1
11 files changed, 12 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff7749e..429ed46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,7 @@ stages:
- ninja -C build install
- popd
- $PYTHON setup.py build
- - $PYTHON setup.py install
+ - $PYTHON -m pip install .
- $PYTHON setup.py test
- $PYTHON setup.py sdist
- if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ; then rpmbuild --nodeps -ta dist/libvirt-python*tar.gz ; fi
@@ -40,7 +40,7 @@ stages:
- export CFLAGS="-Werror"
script:
- $PYTHON setup.py build
- - $PYTHON setup.py install
+ - $PYTHON -m pip install .
- $PYTHON setup.py test
- $PYTHON setup.py sdist
- if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ; then rpmbuild --nodeps -ta dist/libvirt-python*tar.gz ; fi
diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile
index 83b3fe6..fff1a19 100644
--- a/ci/containers/centos-stream-8.Dockerfile
+++ b/ci/containers/centos-stream-8.Dockerfile
@@ -37,6 +37,7 @@ RUN dnf update -y && \
python3-devel \
python3-docutils \
python3-lxml \
+ python3-pip \
python3-pytest \
python3-setuptools \
rpcgen \
diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile
index dd28856..0def4f5 100644
--- a/ci/containers/debian-10.Dockerfile
+++ b/ci/containers/debian-10.Dockerfile
@@ -21,6 +21,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3 \
python3-dev \
python3-lxml \
+ python3-pip \
python3-pytest \
python3-setuptools && \
eatmydata apt-get autoremove -y && \
diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile
index a5e5b52..ad0f52d 100644
--- a/ci/containers/debian-sid.Dockerfile
+++ b/ci/containers/debian-sid.Dockerfile
@@ -21,6 +21,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3 \
python3-dev \
python3-lxml \
+ python3-pip \
python3-pytest \
python3-setuptools && \
eatmydata apt-get autoremove -y && \
diff --git a/ci/containers/fedora-34.Dockerfile b/ci/containers/fedora-34.Dockerfile
index 7e1452b..2e3c2ae 100644
--- a/ci/containers/fedora-34.Dockerfile
+++ b/ci/containers/fedora-34.Dockerfile
@@ -28,6 +28,7 @@ exec "$@"' > /usr/bin/nosync && \
python3 \
python3-devel \
python3-lxml \
+ python3-pip \
python3-pytest \
python3-setuptools \
rpm-build && \
diff --git a/ci/containers/fedora-35.Dockerfile b/ci/containers/fedora-35.Dockerfile
index ed2b501..8980e0b 100644
--- a/ci/containers/fedora-35.Dockerfile
+++ b/ci/containers/fedora-35.Dockerfile
@@ -28,6 +28,7 @@ exec "$@"' > /usr/bin/nosync && \
python3 \
python3-devel \
python3-lxml \
+ python3-pip \
python3-pytest \
python3-setuptools \
rpm-build && \
diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile
index 44bad30..7ad90a6 100644
--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@@ -29,6 +29,7 @@ exec "$@"' > /usr/bin/nosync && \
python3 \
python3-devel \
python3-lxml \
+ python3-pip \
python3-pytest \
python3-setuptools \
rpm-build && \
diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/opensuse-leap-152.Dockerfile
index 9218ff7..c90905e 100644
--- a/ci/containers/opensuse-leap-152.Dockerfile
+++ b/ci/containers/opensuse-leap-152.Dockerfile
@@ -18,6 +18,7 @@ RUN zypper update -y && \
python3-base \
python3-devel \
python3-lxml \
+ python3-pip \
python3-pytest \
python3-setuptools \
rpm-build && \
diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile
index df23812..f9ba881 100644
--- a/ci/containers/opensuse-tumbleweed.Dockerfile
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@@ -18,6 +18,7 @@ RUN zypper dist-upgrade -y && \
python3-base \
python3-devel \
python3-lxml \
+ python3-pip \
python3-pytest \
python3-setuptools \
rpm-build && \
diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile
index cc07c71..74a73c7 100644
--- a/ci/containers/ubuntu-1804.Dockerfile
+++ b/ci/containers/ubuntu-1804.Dockerfile
@@ -21,6 +21,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3 \
python3-dev \
python3-lxml \
+ python3-pip \
python3-pytest \
python3-setuptools && \
eatmydata apt-get autoremove -y && \
diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile
index 950780e..63419a7 100644
--- a/ci/containers/ubuntu-2004.Dockerfile
+++ b/ci/containers/ubuntu-2004.Dockerfile
@@ -21,6 +21,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3 \
python3-dev \
python3-lxml \
+ python3-pip \
python3-pytest \
python3-setuptools && \
eatmydata apt-get autoremove -y && \