From: Jacob Lifshay <programmerjake@gmail.com>
Date: Tue, 13 Jun 2023 01:40:13 +0000 (-0700)
Subject: switch to pytest-xdist==3.3.1 pytest==7.3.1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6803a691ff9f38d61976c9f9359abe32b2ca8998;p=dev-env-setup.git

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

diff --git a/hdl-dev-repos b/hdl-dev-repos
index a549da6..0cb3c1b 100755
--- 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 60d8cb4..33cd7f1 100755
--- 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 c261904..6433746 100755
--- 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