From 8e62c88e805b5eed426cbaed5f868751666de6ea Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 2 May 2022 09:07:23 -0400
Subject: [PATCH 1/2] changed to python3.8-dev, added python3.8-venv, updated
 pystan to 2.19.1.1 (old version was breaking docker build for some reason)

---
 Dependencies/Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dependencies/Dockerfile b/Dependencies/Dockerfile
index b19591f..93450fa 100644
--- a/Dependencies/Dockerfile
+++ b/Dependencies/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update &&\
         clang \
         git \
         openssl \
-        python3-dev \
+        python3.8-dev \
         pipenv \
         vim \
         wget \
@@ -41,6 +41,7 @@ RUN apt-get update &&\
         libyaml-cpp-dev \
         rapidjson-dev \
         pybind11-dev \
+        python3.8-venv \
         &&\
     apt-get clean &&\
     /bin/true
@@ -82,7 +83,7 @@ RUN pip3 install --upgrade pip &&\
         'python-dateutil==2.8.1' \
         'numpy>=1.14' \
         'Cython>=0.22' \
-        'pystan==2.17.1.0' \
+        'pystan==2.19.1.1' \
         'uproot4>=4.0.0' \
         'lz4' \
         'pbr==5.5.1' \
@@ -91,6 +92,7 @@ RUN pip3 install --upgrade pip &&\
         'h5py' \
         'matplotlib' \
         'scipy==1.6.1' \
+        'build' \
         &&\
     /bin/true
 

From 3aeef0eea7e6f9736408efcbc04a669b8d7e27ce Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 19 Jul 2022 14:23:04 -0700
Subject: [PATCH 2/2] Re-testing issue with pystan 2.17.1

---
 Dependencies/Dockerfile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Dependencies/Dockerfile b/Dependencies/Dockerfile
index 93450fa..ce3e95a 100644
--- a/Dependencies/Dockerfile
+++ b/Dependencies/Dockerfile
@@ -83,7 +83,6 @@ RUN pip3 install --upgrade pip &&\
         'python-dateutil==2.8.1' \
         'numpy>=1.14' \
         'Cython>=0.22' \
-        'pystan==2.19.1.1' \
         'uproot4>=4.0.0' \
         'lz4' \
         'pbr==5.5.1' \
@@ -94,10 +93,13 @@ RUN pip3 install --upgrade pip &&\
         'scipy==1.6.1' \
         'build' \
         &&\
+    pip3 install -v \
+        'pystan==2.17.1.0' \
+        &&\
     /bin/true
 
 # ROOT is currently not available in the package manager (latest is in xenial)
-RUN ROOT_TARBALL="root_v6.22.06.Linux-ubuntu20-x86_64-gcc9.3.tar.gz" &&\
-    cd /usr/local &&\
-    wget https://root.cern/download/$ROOT_TARBALL &&\
-    tar -xzf $ROOT_TARBALL
+#RUN ROOT_TARBALL="root_v6.22.06.Linux-ubuntu20-x86_64-gcc9.3.tar.gz" &&\
+#    cd /usr/local &&\
+#    wget https://root.cern/download/$ROOT_TARBALL &&\
+#    tar -xzf $ROOT_TARBALL