From a6d043eb62248aa9044489815e881a1feb091430 Mon Sep 17 00:00:00 2001
From: Paul Hewlett <1104895+eccles@users.noreply.github.com>
Date: Mon, 8 Apr 2024 16:32:11 +0100
Subject: [PATCH] Fix merkleLog confirmation (#89)

AB#9103
---
 .gitignore       |  1 +
 Dockerfile       | 10 ++++++++++
 requirements.txt |  8 +++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 4817ca2..2a64e54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ dist/
 .coverage
 *,cover
 *.xml
+*.whl
 *.pem
 *.aid
 htmlcov/
diff --git a/Dockerfile b/Dockerfile
index 7e85c01..c04ac60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,16 @@ FROM python:${VERSION}-bookworm
 
 COPY requirements.txt requirements-dev.txt /tmp/
 
+# when testing a new version of the github datatrails-python repo copy the wheel
+# (generated by 'task wheel') from that repo and uncomment
+# the following lines. Also comment out the datatrails-archivist line in
+# requirements.txt.
+# That way one can test an unreleased version of github datatrails-samples.
+# NB dont forget to recomment before merging !!
+#COPY datatrails*.whl /tmp/
+#RUN python3 -m pip -qq install /tmp/datatrails*.whl \
+#  && rm -f /tmp/datatrails*.whl
+
 RUN python3 -m pip -qq install --upgrade pip \
   && python3 -m pip -qq install -r /tmp/requirements-dev.txt \
   && rm -f /tmp/requirements-dev.txt \
diff --git a/requirements.txt b/requirements.txt
index 339dc1c..9cbd1c7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,10 @@
 cryptography~=41.0.2
 importlib-resources==3.0.0; python_version < '3.9'
-datatrails-archivist==0.29.0a1
 pyyaml~=6.0.1
+
+# when testing a new version of the github datatrails-python repo copy the wheel
+# (generated by 'task wheel') from that repo and comment
+# the following lines. Also do similar in the Dockerfile.
+# That way one can test an unreleased version of github datatrails-samples.
+# NB dont forget to uncomment before merging !!
+datatrails-archivist==0.30.0