From 49a2ff4ed3eb4e764dc6b05f4484f8735b202254 Mon Sep 17 00:00:00 2001 From: Marcela Melara Date: Tue, 29 Aug 2023 16:11:28 -0700 Subject: [PATCH] Use in-toto-attestation v0.9.2 Signed-off-by: Marcela Melara --- Makefile | 3 +-- python/README.md | 11 ++--------- requirements.txt | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 2c676dd..e97d294 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,6 @@ # limitations under the License. VENVDIR ?= ./scai-venv -INTOTODIR ?= ../attestation PY_VERSION=${shell python3 --version | sed 's/Python \(3\.[0-9]\).*/\1/'} PYTHON_DIR=$(VENVDIR)/lib/python$(PY_VERSION)/site-packages/ @@ -24,7 +23,7 @@ $(PYTHON_DIR): . $(abspath $(VENVDIR)/bin/activate) && pip install --upgrade pip . $(abspath $(VENVDIR)/bin/activate) && pip install --upgrade wheel . $(abspath $(VENVDIR)/bin/activate) && pip install --upgrade in-toto - . $(abspath $(VENVDIR)/bin/activate) && pip install --upgrade ${INTOTODIR}/python + . $(abspath $(VENVDIR)/bin/activate) && pip install --upgrade in-toto-attestation>=0.9.2 . $(abspath $(VENVDIR)/bin/activate) && pip install --upgrade ./python $(VENVDIR): diff --git a/python/README.md b/python/README.md index 4421a3a..5ab5086 100644 --- a/python/README.md +++ b/python/README.md @@ -9,18 +9,11 @@ are required on a minimal Ubuntu system. We assume Ubuntu 20.04 or higher. sudo apt install git python3 python3-dev python3-venv virtualenv build-essential ``` -Then, clone the in-toto Attestation Framework repository, on which the -SCAI tools are built - -``` -git clone https://github.com/in-toto/attestation.git -``` - -Finally, set up the Python virtualenv for the SCAI CLI tools from this +Then, set up the Python virtualenv for the SCAI CLI tools from this repo's root directory. ``` -make VENVDIR= INTOTODIR= py-venv +make VENVDIR= py-venv ``` ## Basic CLI Invocation diff --git a/requirements.txt b/requirements.txt index 9bcd177..6068e1a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ # scai library python requirements -in-toto-attestation>=0.9.1 +in-toto-attestation>=0.9.2