From: Magnus Jacobsson <Magnus.Jacobsson@berotec.se>
Date: Mon, 20 Apr 2020 11:42:05 +0000 (+0200)
Subject: Add pytest for Python 3 to Docker images missing it
X-Git-Tag: 2.44.1~76^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b101863d93057677eb0f035d58e608114b576a82;p=graphviz

Add pytest for Python 3 to Docker images missing it
---

diff --git a/ci/centos7/Dockerfile b/ci/centos7/Dockerfile
index 4d128f83e..f6160c1a5 100644
--- a/ci/centos7/Dockerfile
+++ b/ci/centos7/Dockerfile
@@ -94,6 +94,8 @@ RUN yum -y install tk-devel
 
 # Test utilities
 RUN yum -y install -y python-pytest
+RUN rpm --install https://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/p/python36-py-1.4.32-2.el7.noarch.rpm
+RUN rpm --install https://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/p/python36-pytest-2.9.2-4.el7.noarch.rpm
 
 # Clean up
 RUN yum clean all && rm -rf /var/cache/yum
diff --git a/ci/fedora29/Dockerfile b/ci/fedora29/Dockerfile
index fbb5923bf..0352606fa 100644
--- a/ci/fedora29/Dockerfile
+++ b/ci/fedora29/Dockerfile
@@ -108,6 +108,7 @@ RUN yum -y install mono-core
 
 # Test utilities
 RUN yum -y install -y python-pytest
+RUN yum -y install -y python3-pytest
 
 # Clean up
 RUN yum clean all && rm -rf /var/cache/yum
diff --git a/ci/fedora30/Dockerfile b/ci/fedora30/Dockerfile
index ada5388c5..2023e0797 100644
--- a/ci/fedora30/Dockerfile
+++ b/ci/fedora30/Dockerfile
@@ -105,6 +105,7 @@ RUN yum -y install mono-core
 
 # Test utilities
 RUN yum -y install -y python-pytest
+RUN yum -y install -y python3-pytest
 
 # Clean up
 RUN yum clean all && rm -rf /var/cache/yum
diff --git a/ci/ubuntu-18.04/Dockerfile b/ci/ubuntu-18.04/Dockerfile
index d7316b84e..3af59e0d6 100644
--- a/ci/ubuntu-18.04/Dockerfile
+++ b/ci/ubuntu-18.04/Dockerfile
@@ -101,6 +101,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y tcl-dev
 
 # Test utilities
 RUN apt-get update && apt-get install --no-install-recommends -y python-pytest
+RUN apt-get update && apt-get install --no-install-recommends -y python3-pytest
 
 # Clean up
 RUN rm -rf /var/lib/apt/lists/*
diff --git a/ci/ubuntu-19.04/Dockerfile b/ci/ubuntu-19.04/Dockerfile
index bdae86528..8a3f018c8 100644
--- a/ci/ubuntu-19.04/Dockerfile
+++ b/ci/ubuntu-19.04/Dockerfile
@@ -101,6 +101,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y tcl-dev
 
 # Test utilities
 RUN apt-get update && apt-get install --no-install-recommends -y python-pytest
+RUN apt-get update && apt-get install --no-install-recommends -y python3-pytest
 
 # Clean up
 RUN rm -rf /var/lib/apt/lists/*
diff --git a/ci/ubuntu-19.10/Dockerfile b/ci/ubuntu-19.10/Dockerfile
index e5c396184..14ff07d13 100644
--- a/ci/ubuntu-19.10/Dockerfile
+++ b/ci/ubuntu-19.10/Dockerfile
@@ -101,6 +101,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y tcl-dev
 
 # Test utilities
 RUN apt-get update && apt-get install --no-install-recommends -y python-pytest
+RUN apt-get update && apt-get install --no-install-recommends -y python3-pytest
 
 # Clean up
 RUN rm -rf /var/lib/apt/lists/*
diff --git a/ci/ubuntu-20.04/Dockerfile b/ci/ubuntu-20.04/Dockerfile
index a31a52e22..4bd1e17b6 100644
--- a/ci/ubuntu-20.04/Dockerfile
+++ b/ci/ubuntu-20.04/Dockerfile
@@ -102,6 +102,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y tcl-dev
 
 # Test utilities
 RUN apt-get update && apt-get install --no-install-recommends -y python-pytest
+RUN apt-get update && apt-get install --no-install-recommends -y python3-pytest
 
 # Clean up
 RUN rm -rf /var/lib/apt/lists/*