Merge pull request #5883 from brockdyer03/pytest-dockers

Update Dockerfiles for upcoming Pytest changes

Author: prckent

.github/workflows/ci-github-actions.yaml

@@ -172,7 +172,7 @@ jobs:
         run: |
           brew upgrade || brew link --overwrite python@3.12
           brew install gcc@14 ninja hdf5 fftw boost
-          python3 -m pip install numpy h5py
+          python3 -m pip install numpy h5py pytest pytest-cov pytest-order
 
       - name: Configure
         run: tests/test_automation/github-actions/ci/run_step.sh configure

config/docker/dependencies/centos10/Dockerfile

@@ -11,6 +11,9 @@ RUN dnf install -y ninja-build
 RUN dnf install -y rsync # Nexus hard requirement
 RUN dnf install -y python3-numpy
 RUN dnf install -y python3-h5py
+RUN dnf install -y python3-pytest
+RUN dnf install -y python3-pytest-cov
+RUN dnf install -y python3-pytest-order
 
 ## Add a user different from root for OpenMPI
 RUN adduser -u 1000 -d /home/user -s /bin/bash user

config/docker/dependencies/ubuntu22/clang/Dockerfile

@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive &&\
     sudo \
     curl \
     rsync \
+    python3-numpy python3-pytest python3-pytest-cov python3-pytest-order \
     wget \
     software-properties-common \
     vim \

config/docker/dependencies/ubuntu22/openmpi/Dockerfile

@@ -45,6 +45,8 @@ RUN export DEBIAN_FRONTEND=noninteractive &&\
     python3-pandas \
     python3-coverage \
     python3-pytest \
+    python3-pytest-cov \
+    python3-pytest-order \
     python3-pip \
     -y
 

config/docker/dependencies/ubuntu22/serial/Dockerfile

@@ -43,6 +43,8 @@ RUN export DEBIAN_FRONTEND=noninteractive &&\
     python3-pandas \
     python3-coverage \
     python3-pytest \
+    python3-pytest-cov \
+    python3-pytest-order \
     python3-pip \
     -y
 

nexus/pyproject.toml

@@ -26,6 +26,8 @@ build-backend = "hatchling.build"
 [dependency-groups]
 dev = [
     "pytest>=9.0.2",
+    "coverage[toml]>=7.13.5; python-version < '3.11'",
+    "coverage>=7.13.5; python-version >= '3.11'",
     "pytest-cov>=7.0.0",
 ]
 

tests/test_automation/containers/Dockerfile_gcc_mpi_develop_complete

@@ -28,7 +28,8 @@ RUN groupadd --gid $USER_GID $USERNAME \
 RUN apt-get install -y --no-install-recommends \
     ca-certificates make ninja-build git cmake wget bzip2 rsync  g++ gfortran openmpi-bin libopenmpi-dev libboost-dev \
     libopenblas-openmp-dev libhdf5-dev libxml2-dev libfftw3-dev \
-    python3-numpy python3-scipy python3-pandas python3-h5py python3-matplotlib
+    python3-numpy python3-scipy python3-pandas python3-h5py python3-matplotlib \
+    python3-pytest python3-pytest-cov python3-pytest-order
 
 # Convenience feature to setup certificates for behind firewall builds.
 # * Copy any provided certificates into the container and update the SSL config