From 8acf3ca8de0470b6249f947a360933edf7f2b36c Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sat, 31 May 2025 14:15:19 -0700
Subject: [PATCH] Pin riscof, riscv-config, and riscv-isac versions

---
 bin/installation/python-setup.sh | 7 ++++++-
 bin/requirements.txt             | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bin/installation/python-setup.sh b/bin/installation/python-setup.sh
index d746efd89..3c7d4e64f 100755
--- a/bin/installation/python-setup.sh
+++ b/bin/installation/python-setup.sh
@@ -27,6 +27,11 @@
 ## and limitations under the License.
 ################################################################################################
 
+# NOTE: These three tools need to be kept in sync. Update all versions simultaneously.
+export RISCOF_VERSION=be84132874963e001c14d846a140a3edd9c9d48f # Last commit as May 31, 2025
+export RISCV_CONFIG_VERSION=54171f205be802f9f8e0b1cf4156a6cc826fb467 # Last commit as of May 31, 2025
+export RISCV_ISAC_VERSION=450de2eabfe4fcdfdf54135b5ab2dbb1d94805f8 # Last commit as of May 31, 2025 (commit hash of riscv-arch-test repo)
+
 set -e # break on error
 # If run standalone, check environment. Otherwise, use info from main install script
 if [ -z "$FAMILY" ]; then
@@ -53,6 +58,6 @@ source "$RISCV"/riscv-python/bin/activate # activate python virtual environment
 # Install python packages, including RISCOF (https://github.com/riscv-software-src/riscof.git)
 # RISCOF is a RISC-V compliance test framework that is used to run the RISC-V Arch Tests.
 STATUS="python packages"
-pip install --upgrade pip && pip install --upgrade -r "$dir"/requirements.txt
+pip install --upgrade pip && pip install --upgrade -r "$WALLY"/bin/requirements.txt
 
 echo -e "${SUCCESS_COLOR}Python environment successfully configured!${ENDC}"
diff --git a/bin/requirements.txt b/bin/requirements.txt
index f0bb082fd..f5440ec93 100644
--- a/bin/requirements.txt
+++ b/bin/requirements.txt
@@ -4,9 +4,9 @@ Markdown>=3.6
 matplotlib>=3.9.0
 pre-commit>=4.0.0
 PyYAML>=5.2
-riscof @ git+https://github.com/riscv/riscof.git
-riscv-config @ git+https://github.com/riscv-software-src/riscv-config
-riscv-isac @ git+https://github.com/riscv-non-isa/riscv-arch-test/#subdirectory=riscv-isac
+riscof @ git+https://github.com/riscv/riscof.git@${RISCOF_VERSION} # version set in python-setup.sh
+riscv-config @ git+https://github.com/riscv-software-src/riscv-config.git@${RISCV_CONFIG_VERSION} # version set in python-setup.sh
+riscv-isac @ git+https://github.com/riscv-non-isa/riscv-arch-test.git@${RISCV_ISAC_VERSION}#subdirectory=riscv-isac # version set in python-setup.sh
 scikit-learn>=1.5.0
 scipy>=1.13.0
 setuptools