switch to pytest-xdist==3.3.1 pytest==7.3.1

diff --git a/hdl-dev-repos b/hdl-dev-repos
index a549da6da1bfba45b5d0de3f80255ba892bbf7cb..0cb3c1b7147b7d7963565831156e15e228222cf2 100755 (executable)
--- a/hdl-dev-repos
+++ b/hdl-dev-repos
@@ -18,7 +18,16 @@ git clone https://git.libre-soc.org/git/ieee754fpu.git
 git clone https://gitlab.com/nmigen/nmigen-soc.git
 git clone https://gitlab.com/nmigen/nmigen-stdio.git
 git clone https://git.libre-soc.org/git/soc.git
+git clone https://git.libre-soc.org/git/pytest-output-to-files.git
 '
+
+# pytest
+python3 -m pip install pytest-xdist==3.3.1 pytest==7.3.1
+
+# pytest-output-to-files
+cd /home/$SUDO_USER/src/pytest-output-to-files
+python3 setup.py develop
+
 # pyvcd - needed for nmigen
 cd /home/$SUDO_USER/src/pyvcd
 git checkout 0.2.4

diff --git a/hdl-dev-repos-virtualenv b/hdl-dev-repos-virtualenv
index 60d8cb48e48842572e2cc43454e3d56b88de4d71..33cd7f19e5dd4853819183c5309a4f6ea3305044 100755 (executable)
--- a/hdl-dev-repos-virtualenv
+++ b/hdl-dev-repos-virtualenv
@@ -12,9 +12,15 @@ git clone https://git.libre-soc.org/git/openpower-isa.git
 git clone https://git.libre-soc.org/git/ieee754fpu.git
 git clone https://gitlab.com/nmigen/nmigen-soc.git
 git clone https://git.libre-soc.org/git/soc.git
+git clone https://git.libre-soc.org/git/pytest-output-to-files.git
+
+# pytest-output-to-files
+pushd pytest-output-to-files
+python3 setup.py develop
+popd
 
 # pyvcd - needed for nmigen
-cd cd /home/$SUDO_USER/src/pyvcd
+cd /home/$SUDO_USER/src/pyvcd
 git checkout 0.2.4
 python3 setup.py develop --no-deps
 

diff --git a/install-hdl-apt-reqs b/install-hdl-apt-reqs
index c2619044185b4cf3988f9d0e8cf44522d69f16f5..64337460ea7b2c03dd5c518021b87c6cd2d0e431 100755 (executable)
--- a/install-hdl-apt-reqs
+++ b/install-hdl-apt-reqs
@@ -64,11 +64,6 @@ apt-get install -y autoconf \
     wget \
     xdot
 
-# really don't like using pip3, but it is the easiest way to install
-# specific versions of software. in this case, versions that don't eat memory
-pip3 install pytest==3.2.5
-pip3 install pytest-xdist==1.13
-
 # have to also upgrade sysvinit-core to stop it getting removed
 apt-get -t buster-backports install -y qemu-system-ppc/buster-backports