m

Author: lucasmcdonald3

requirements_mpl.txt

@@ -1 +1 @@
-aws-cryptographic-material-providers==1.7.2
+aws-cryptographic-material-providers==1.7.3

test_vector_handlers/scripts/install_mpl_test_vector_runner.sh

@@ -4,17 +4,21 @@
 # This script is intended to be used by ESDK-Python's integration tests.
 # You may need or want to make local changes to get this work on your machine.
 
+# Change to the directory of the script
+cd "$(dirname "$0")"
+
+# Get MPL version specified in requirements.txt
+export mplVersion=$(grep 'aws-cryptographic-material-providers==' ../requirements_mpl.txt | sed -E 's/.*==(.+)/\1/')
+
 # Clone MPL repo to get test vectors runner source code and the Dafny version to use
-git clone --recurse-submodules https://github.com/aws/aws-cryptographic-material-providers-library.git
+git clone --branch v$mplVersion --recurse-submodules https://github.com/aws/aws-cryptographic-material-providers-library.git
+
 # Download Dafny to build the test vector runner; get Dafny version from ESDK's project.properties file
 export dafnyVersion=$(grep '^dafnyVersion=' aws-cryptographic-material-providers-library/project.properties | cut -d '=' -f 2)
 curl https://github.com/dafny-lang/dafny/releases/download/v$dafnyVersion/dafny-$dafnyVersion-x64-ubuntu-20.04.zip  -L -o dafny.zip
 unzip -qq dafny.zip && rm dafny.zip
 export PATH="$PWD/dafny:$PATH"
+
 # Build MPL test vector runner from source
 cd aws-cryptographic-material-providers-library/TestVectorsAwsCryptographicMaterialProviders/
 make transpile_python
-# Install built runner.
-# (no-deps skips installing its local MPL dependency in favor of the one from PyPI.)
-pip install runtimes/python --no-deps
-cd ../../

test_vector_handlers/tox.ini

@@ -51,6 +51,9 @@ deps =
     -rtest/requirements.txt
     # Install the MPL requirements if the `-mpl` suffix is present
     mpl: -rrequirements_mpl.txt
+    # This is the filepath used in ESDK-Python's integration tests.
+    # You may need to change this to run this project locally.
+    mpl: scripts/aws-cryptographic-material-providers-library/TestVectorsAwsCryptographicMaterialProviders/runtimes/python
     ..
 commands = 
     awses_local: {[testenv:base-command]commands}