Merge pull request #958 from hdoupe/archive-tb

Archive Tax-Brain webapp
ospc-org · Jun 14, 2019 · 5edffcd · 5edffcd
2 parents 1a917b2 + 8ab2780
commit 5edffcd
Show file tree

Hide file tree

Showing 18 changed files with 502 additions and 119 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,15 +2,27 @@ FROM heroku/miniconda:3
 
 # Grab requirements.txt.
 ADD ./requirements.txt /requirements.txt
-ADD ./conda-requirements.txt /conda-requirements.txt
 
 # python version
 RUN python --version
 
 # Install dependencies
 RUN conda update conda
-RUN conda install -c pslmodels -c anaconda --file conda-requirements.txt --yes
-RUN pip install -qr requirements.txt
+# Pin significant conda packages to version from 1.7.7 release.
+RUN conda install --yes \
+    "numpy==1.14.2" \
+    "pandas==0.23.4" \
+    "bokeh==1.0.2" \
+    "numba==0.41.0" \
+    "scipy==1.1.0" \
+    "pyparsing==2.3.0" \
+    "matplotlib==3.0.1" \
+    "pillow==5.3.0"
+COPY distributed/taxcalc-0.24.0-py36_0.tar.bz2 /home/taxcalc-0.24.0-py36_0.tar.bz2
+COPY distributed/btax-0.2.8-py36_0.tar.bz2 /home/btax-0.2.8-py36_0.tar.bz2
+RUN conda install --yes /home/taxcalc-0.24.0-py36_0.tar.bz2
+RUN conda install --yes /home/btax-0.2.8-py36_0.tar.bz2
+RUN pip install -r requirements.txt
 
 # Add our code
 ADD ./webapp /opt/webapp/

diff --git a/distributed/Dockerfile b/distributed/Dockerfile
@@ -12,9 +12,21 @@ RUN conda update conda
 RUN conda config --add channels pslmodels
 RUN conda config --append channels conda-forge
 
-RUN conda install python=3.6 numpy>=1.12.1 pandas>=0.23.0 taxcalc=0.24.0 \
-    btax=0.2.8 matplotlib>=3.0.1 numba six bokeh>=0.12.7 mock xlrd \
-    sphinx nomkl
+# RUN conda install -c ospc -c anaconda --file conda-requirements.txt --yes
+RUN conda install --yes \
+    "numpy==1.14.2" \
+    "pandas==0.23.4" \
+    "bokeh==1.0.2" \
+    "numba==0.41.0" \
+    "scipy==1.1.0" \
+    "pyparsing==2.3.0" \
+    "matplotlib==3.0.1" \
+    "pillow==5.3.0"
+COPY taxcalc-0.24.0-py36_0.tar.bz2 /home/taxcalc-0.24.0-py36_0.tar.bz2
+COPY btax-0.2.8-py36_0.tar.bz2 /home/btax-0.2.8-py36_0.tar.bz2
+RUN ls /
+RUN conda install --yes /home/taxcalc-0.24.0-py36_0.tar.bz2
+RUN conda install --yes /home/btax-0.2.8-py36_0.tar.bz2
 
 RUN pip install -r requirements.txt
 
@@ -31,3 +43,9 @@ RUN if [ -z ${PUF_TOKEN+x} ]; \
             write-latest-taxpuf && \
             gunzip -k puf.csv.gz; \
         fi
+
+WORKDIR /home/distributed
+
+RUN pip install -r requirements.txt
+
+WORKDIR /home/distributed/api
diff --git a/distributed/api/run_ogusa.py b/distributed/api/run_ogusa.py
diff --git a/distributed/btax-0.2.8-py36_0.tar.bz2 b/distributed/btax-0.2.8-py36_0.tar.bz2
diff --git a/distributed/docker-compose.yml b/distributed/docker-compose.yml
@@ -1,14 +1,14 @@
 version: '3'
 services:
   flask:
-    image: "${REPO}/flask:${TAG}"
+    image: "flask:${TAG}"
     ports:
       - 5050:5050
     depends_on:
       - redis
       - celery
   celery:
-    image: "${REPO}/celery:${TAG}"
+    image: "celery:${TAG}"
     depends_on:
       - redis
   redis:

diff --git a/distributed/taxcalc-0.24.0-py36_0.tar.bz2 b/distributed/taxcalc-0.24.0-py36_0.tar.bz2
diff --git a/python_env_build.sh b/python_env_build.sh
@@ -3,7 +3,7 @@ conda create -n pb_env python=3.6 --yes
 echo 'successfully created env: pb_env'
 
 echo 'activating env: pb_env'
-source activate pb_env
+conda activate pb_env
 
 echo 'installing conda packages'
 conda install -c pslmodels -c defaults --file conda-requirements.txt --yes

diff --git a/requirements.txt b/requirements.txt
@@ -2,12 +2,10 @@ Django==1.9
 argparse==1.2.1
 dj-database-url==0.3.0
 dj-static==0.0.6
-django-toolbelt==0.0.1
 waitress
 static3==0.5.1
 -e git+https://github.com/funkybob/django-flatblocks.git#egg=django-flatblocks
 sendgrid-django
-psycopg2>=2.5.4
 django-user-accounts
 django-uuidfield==0.5.0
 newrelic
@@ -29,3 +27,4 @@ toolz
 whitenoise
 msgpack
 psycopg2-binary
+gunicorn
diff --git a/templates/dynamic/behavior.html b/templates/dynamic/behavior.html
@@ -125,7 +125,7 @@ <h2>Tax-Calculator Code Build</h2>
               </ul>
               <div class="sidebar-button">
                 <a href="#" ></a>
-                <input id="tax-submit" class="btn btn-secondary btn-block btn-animate" type="submit" value="Start Dynamic Simulation!">
+                <a class="btn btn-secondary btn-block btn-animate" disabled>Start Dynamic Simulation</a>
               </div>
             </div> <!-- sidebar -->
           </div>
@@ -178,4 +178,33 @@ <h1>Partial Equilibrium Simulation</h1>
     </form> <!-- form -->
     <div class="push"></div>
   </div> <!-- /wrapper -->
+  <div class="modal fade" id="redirect-modal" tabindex="-1" role="dialog" aria-labelledby="redirect-modal-label">
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+          <h4 class="modal-title" id="redirect-modal-label">Your sim is now archived.</h4>
+        </div>
+        <div class="modal-body">
+          <p>You may view results and inputs but not edit parameters or re-run the simulation.</p>
+          <p>The Tax-Brain webapp is now hosted at <a href="https://compmodels.org/PSLmodels/Tax-Brain/">compmodels.org/PSLmodels/Tax-Brain/</a></p>
+        </div>
+        <div class="modal-footer">
+          <a type="button" class="btn btn-default" data-dismiss="modal">Close</a>
+        </div>
+      </div>
+    </div>
+  </div>
+
+{% endblock %}
+
+{% block bottom_scripts %}
+<script>
+  $(document).ready(function() {
+    $("#redirect-modal").modal("show");
+    $("input.form-control").each(function() {
+      $(this).attr("disabled", true);
+    });
+  })
+</script>
 {% endblock %}
diff --git a/templates/dynamic/elasticity.html b/templates/dynamic/elasticity.html
@@ -124,7 +124,7 @@ <h2>Tax-Calculator Code Build</h2>
               </ul>
               <div class="sidebar-button">
                 <a href="#" ></a>
-                <input id="tax-submit" class="btn btn-secondary btn-block btn-animate" type="submit" value="Start Dynamic Simulation!">
+                <a class="btn btn-secondary btn-block btn-animate" disabled>Start Dynamic Simulation</a>
               </div>
             </div> <!-- sidebar -->
           </div>
@@ -173,4 +173,34 @@ <h1>Macroeconomic Elasticity Simulation</h1>
     </form> <!-- form -->
     <div class="push"></div>
   </div> <!-- /wrapper -->
+  <div class="modal fade" id="redirect-modal" tabindex="-1" role="dialog" aria-labelledby="redirect-modal-label">
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+          <h4 class="modal-title" id="redirect-modal-label">Your sim is now archived.</h4>
+        </div>
+        <div class="modal-body">
+          <p>You may view results and inputs but not edit parameters or re-run the simulation.</p>
+          <p>The Tax-Brain webapp is now hosted at <a href="https://compmodels.org/PSLmodels/Tax-Brain/">compmodels.org/PSLmodels/Tax-Brain/</a></p>
+        </div>
+        <div class="modal-footer">
+          <a type="button" class="btn btn-default" data-dismiss="modal">Close</a>
+        </div>
+      </div>
+    </div>
+  </div>
+
+
+{% endblock %}
+
+{% block bottom_scripts %}
+<script>
+  $(document).ready(function() {
+    $("#redirect-modal").modal("show");
+    $("input.form-control").each(function() {
+      $(this).attr("disabled", true);
+    });
+  })
+</script>
 {% endblock %}
diff --git a/templates/dynamic/elasticity_results.html b/templates/dynamic/elasticity_results.html
@@ -144,7 +144,31 @@ <h1>Elasticity Results</h1>
     }
     </script>
     <div class="push"></div>
+    <div class="modal fade" id="redirect-modal" tabindex="-1" role="dialog" aria-labelledby="redirect-modal-label">
+        <div class="modal-dialog" role="document">
+          <div class="modal-content">
+            <div class="modal-header">
+              <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+              <h4 class="modal-title" id="redirect-modal-label">Your sim is now archived.</h4>
+            </div>
+            <div class="modal-body">
+              <p>You may view results and inputs but not edit parameters or re-run the simulation.</p>
+              <p>The Tax-Brain webapp is now hosted at <a href="https://compmodels.org/PSLmodels/Tax-Brain/">compmodels.org/PSLmodels/Tax-Brain/</a></p>
+            </div>
+            <div class="modal-footer">
+              <a type="button" class="btn btn-default" data-dismiss="modal">Close</a>
+            </div>
+          </div>
+        </div>
+      </div>
+
 </div> <!-- /wrapper -->
+<script>
+    $(document).ready(function() {
+      $("#redirect-modal").modal("show");
+    });
+  </script>
 
 <div id="results-table"></div>
 {% endblock %}
+