From d0f7c31e5e6fb6aa0d55068b2688f47f9ba37be6 Mon Sep 17 00:00:00 2001
From: "Paul P.H. Wilson" <paul.wilson@wisc.edu>
Date: Thu, 17 Feb 2022 10:54:44 -0600
Subject: [PATCH 1/3] Update Ubuntu script to match version restrictions of
 current PyNE

---
 ubuntu.sh | 41 ++++++++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/ubuntu.sh b/ubuntu.sh
index 2c055ba..efea4a6 100755
--- a/ubuntu.sh
+++ b/ubuntu.sh
@@ -2,9 +2,15 @@
 # list of package installed through apt-get 
 # (required to run this scripts and/or as dependancies for PyNE and its depedancies)
 apt_package_list="software-properties-common \
-                  python3-pip \
                   wget \
+                  g++ \
                   build-essential \
+                  python3-setuptools \
+                  python3-pip \
+                  python3-setuptools \
+                  python3-dev \
+                  python3-packaging \
+                  libpython3-dev \
                   git \
                   cmake \
                   gfortran \
@@ -12,18 +18,29 @@ apt_package_list="software-properties-common \
                   liblapack-dev \
                   libeigen3-dev \
                   libhdf5-dev \
+                  libhdf5-serial-dev \
+                  autoconf \
+                  libtool \
+                  doxygen \
                   hdf5-tools"
 
 # list of python package required for PyNE and its depedencies (installed using pip3 python package manager)
-pip_package_list="numpy \
-                  scipy \
-                  cython \
-                  nose \
-                  tables \
-                  matplotlib \
-                  jinja2 \
-                  setuptools \
-                  future"
+pip_package_list_a='sphinx \ 
+                    cloud_sptheme \
+                    prettytable \
+                    "setuptools<49" \
+                    sphinxcontrib_bibtex \
+                    numpydoc \
+                    nbconvert \
+                    numpy \
+                    nose \
+                    cython \
+                    future \
+                    "tables<3.7" \
+                    scipy \
+                    jinja2 \
+                    progress'
+pip_package_list_b='matplotlib'
 
 # hdf5 std directory
 hdf5_libdir=/usr/lib/x86_64-linux-gnu/hdf5/serial
@@ -45,7 +62,9 @@ function check_repo() {
 # system update
 sudo apt-get -y update
 sudo apt-get install -y ${apt_package_list}
-pip3 install --user ${pip_package_list}
+pip3 install --upgrade pip
+pip3 install --force-reinstall --user ${pip_package_list_a}
+pip3 install ${pip_pacakge_list_b}
 
 install_dir=${HOME}/opt
 mkdir -p ${install_dir}

From 8d901e29b7819b71a6d21aebb21fa4d70bb01229 Mon Sep 17 00:00:00 2001
From: Paul Wilson <paul.wilson@wisc.edu>
Date: Wed, 18 May 2022 14:03:47 -0500
Subject: [PATCH 2/3] Update ubuntu.sh

remove extra line

Co-authored-by: Nancy Granda <grandaduarte@wisc.edu>
---
 ubuntu.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ubuntu.sh b/ubuntu.sh
index efea4a6..9aa5248 100755
--- a/ubuntu.sh
+++ b/ubuntu.sh
@@ -7,7 +7,6 @@ apt_package_list="software-properties-common \
                   build-essential \
                   python3-setuptools \
                   python3-pip \
-                  python3-setuptools \
                   python3-dev \
                   python3-packaging \
                   libpython3-dev \

From 3dfd9829069d8874d16fdd8e3542f30f5fe0c456 Mon Sep 17 00:00:00 2001
From: "Paul P.H. Wilson" <paul.wilson@wisc.edu>
Date: Sat, 18 Mar 2023 07:57:29 -0500
Subject: [PATCH 3/3] minor upates

---
 ubuntu_20.04-dev.dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ubuntu_20.04-dev.dockerfile b/ubuntu_20.04-dev.dockerfile
index 46a44cb..e6d3400 100644
--- a/ubuntu_20.04-dev.dockerfile
+++ b/ubuntu_20.04-dev.dockerfile
@@ -39,7 +39,8 @@ RUN pip install --user numpy \
                        matplotlib \
                        jinja2 \
                        setuptools \
-                       future
+                       future \
+                       progress
 
 # make working directory
 WORKDIR $HOME/opt
@@ -94,7 +95,7 @@ RUN git clone https://github.com/pyne/pyne.git \
     && python setup.py install --user \
                                --moab $HOME/opt/moab \
                                --dagmc $HOME/opt/dagmc \
-                               --clean
+                               --clean --slow
 
 RUN echo "export PATH=$HOME/.local/bin:\$PATH" >> ~/.bashrc \
     && echo "export LD_LIBRARY_PATH=$HOME/.local/lib:\$LD_LIBRARY_PATH" >> ~/.bashrc \