From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has uploaded a new change for review.
Change subject: replacing cpopen with subprocess32 for py2
......................................................................
replacing cpopen with subprocess32 for py2
Change-Id: Ie7edad0e87d63889788aa5fe6e8bb99a22dc66e5
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M docker/Dockerfile.centos
M docker/Dockerfile.fedora.24
M docker/Dockerfile.fedora.25
M lib/vdsm/common/compat.py
M vdsm.spec.in
5 files changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/78659/1
diff --git a/docker/Dockerfile.centos b/docker/Dockerfile.centos
index cce155b..d99ee9b 100644
--- a/docker/Dockerfile.centos
+++ b/docker/Dockerfile.centos
@@ -22,7 +22,6 @@
ovirt-imageio-common \
psmisc \
python-blivet \
- python-cpopen \
python-dateutil \
python-decorator \
python-devel \
@@ -34,6 +33,7 @@
python-requests \
python-setuptools \
python-six \
+ python-subprocess32 \
python34 \
python34-nose \
python34-six \
diff --git a/docker/Dockerfile.fedora.24 b/docker/Dockerfile.fedora.24
index a6d43f3..4938ae1 100644
--- a/docker/Dockerfile.fedora.24
+++ b/docker/Dockerfile.fedora.24
@@ -24,7 +24,6 @@
ovirt-imageio-common \
psmisc \
python-blivet \
- python-cpopen \
python-dateutil \
python-decorator \
python-devel \
@@ -36,6 +35,7 @@
python-pthreading \
python-requests \
python-six \
+ python-subprocess32 \
python2-mock \
python3 \
python3-dateutil \
diff --git a/docker/Dockerfile.fedora.25 b/docker/Dockerfile.fedora.25
index 1ec0267..9faef9c 100644
--- a/docker/Dockerfile.fedora.25
+++ b/docker/Dockerfile.fedora.25
@@ -25,7 +25,6 @@
ovirt-imageio-common \
psmisc \
python-blivet1 \
- python-cpopen \
python-decorator \
python-devel \
python-inotify \
@@ -36,6 +35,7 @@
python-pthreading \
python-requests \
python-six \
+ python-subprocess32 \
python2-dateutil \
python2-mock \
python3 \
diff --git a/lib/vdsm/common/compat.py b/lib/vdsm/common/compat.py
index 6904571..edb5cd5 100644
--- a/lib/vdsm/common/compat.py
+++ b/lib/vdsm/common/compat.py
@@ -78,7 +78,7 @@
import json # NOQA: F401 (unused import)
if six.PY2:
- from cpopen import CPopen
+ from subprocess32 import Popen as CPopen
else:
from subprocess import Popen as CPopen # NOQA: F401 (unused import)
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 168bf2b..586b670 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -60,8 +60,8 @@
BuildRequires: openssl
BuildRequires: python
-BuildRequires: python-cpopen
BuildRequires: python-six >= 1.9.0
+BuildRequires: python-subprocess32
BuildRequires: python-dateutil
BuildRequires: python2-devel
BuildRequires: PyYAML
@@ -102,7 +102,7 @@
Requires: python-dateutil
Requires: python-netaddr
Requires: python-inotify
-Requires: python-cpopen >= 1.5
+Requires: python-subprocess32
Requires: python-ioprocess >= 0.16.1-1
Requires: python-pthreading >= 0.1.3-3
Requires: python-six >= 1.9.0
@@ -291,7 +291,6 @@
Summary: VDSM python libraries
Requires: %{name}-api = %{version}-%{release}
BuildArch: noarch
-Requires: python-cpopen >= 1.5
Requires: python-ioprocess >= 0.16.1-1
%description python
--
To view, visit
https://gerrit.ovirt.org/78659
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7edad0e87d63889788aa5fe6e8bb99a22dc66e5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>