Merge pull request #259 from dwreeves/dev

Update

Author: dwreeves

README.md

@@ -21,7 +21,7 @@ This code base is built in Python 3.10+ and utilizes the Flask library heavily.
 ```shell
 docker compose build
 docker compose up -d
-docker compose exec flask update-db
+docker compose exec web flask update-db
 docker compose up
 ```
 

app/static/images/daniel_reeves_photo.jpg

@@ -60,15 +60,14 @@ <h2>Predictive Models</h2>
         data from two USGS stream gauges located in Waltham and Brookline.</a>
     </p>
     <h2>Credits</h2>
-        <!-- <img class="auth-img" src="{{ url_for('static', filename='images/daniel_reeves_photo.jpg') }}" alt="Photo of Daniel Reeves near the Charles river." /> -->
         <p>
             This website was built by volunteers at <a href="https://www.codeforboston.org/">Code for Boston</a> in
             collaboration with the Charles River Watershed Association, and is currently maintained on a volunteer
             basis by <a href="https://www.linkedin.com/in/daniel-reeves-27700545/" target="_blank">Daniel Reeves</a>,
             a former project leader at Code For Boston.
         </p>
         <p>
-            The predictive model currently being used for the flagging program website was developed and deployed by <a href="https://www.linkedin.com/in/laura_xia">Laura Xia</a>
+            The predictive model currently being used for the flagging program website was developed and deployed by <a href="https://www.linkedin.com/in/laura_xia" target="_blank">Laura Xia</a>
             (MIT, class of 2026).
              <!-- She has updated the model with new data to reflect the changing conditions of the Charles River. -->
 

app/templates/about.html

@@ -45,10 +45,6 @@ <h2>Stay Updated</h2>
 </p>
 <p>
     You can also <a href="https://twitter.com/crwaflagging">follow the CRWA Flagging Program on Twitter</a> to get
-    automated updates from this website. Our Twitterr bot posts automatic updates every time the predictive model is run.
+    automated updates from this website.
 </p>
-<div class="centered">
-    <a class="twitter-timeline" data-lang="en" data-width="400" data-height="400" href="https://twitter.com/crwaflagging?ref_src=twsrc%5Etfw">Tweets by crwaflagging</a>
-    <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
-</div>
 {% endblock %}

app/templates/index.html

@@ -34,6 +34,9 @@ sentry-sdk[flask]
 tenacity
 tweepy
 
+# https://github.com/pallets-eco/flask-admin/issues/2548
+wtforms==3.1.2
+
 # ==========================================================
 # Testing
 # ==========================================================

requirements.in

@@ -110,6 +110,8 @@ fqdn==1.5.1
     # via jsonschema
 graphql-core==3.2.5
     # via hypothesis-graphql
+greenlet==3.1.1
+    # via sqlalchemy
 gunicorn==23.0.0
     # via -r requirements.in
 h11==0.14.0
@@ -377,7 +379,9 @@ werkzeug==3.1.3
     # via
     #   flask
     #   schemathesis
-wtforms==3.2.1
-    # via flask-admin
+wtforms==3.1.2
+    # via
+    #   -r requirements.in
+    #   flask-admin
 yarl==1.17.2
     # via schemathesis

requirements.txt

@@ -2,28 +2,8 @@
 
 set -eo pipefail
 
-DC="${DC:-exec}"
-
-# If we're running in CI we need to disable TTY allocation for docker-compose
-# commands that enable it by default, such as exec and run.
-TTY=""
-if [[ ! -t 1 ]]; then
-  TTY="-T"
-fi
-
-# -----------------------------------------------------------------------------
-# Helper functions start with _ and aren't listed in this script's help menu.
-# -----------------------------------------------------------------------------
-
-function _dc {
-  docker compose --env-file .env "${DC}" ${TTY} "${@}"
-}
-
-function _build_run_down {
-  docker compose build
-  docker compose run ${TTY} "${@}"
-  docker compose down
-}
+# shellcheck disable=SC2046
+export $(grep -v '^#' .env | xargs)
 
 # -----------------------------------------------------------------------------
 
@@ -41,12 +21,12 @@ function ssl-cert {
 
 function cmd {
   # Run any command you want in the web container
-  _dc web "${@}"
+  docker compose exec web "${@}"
 }
 
 function flask {
   # Run any Flask commands
-  cmd flask "${@}"
+  docker compose exec web flask "${@}"
 }
 
 function lint:dockerfile {
@@ -57,68 +37,28 @@ function lint:dockerfile {
 
 function lint {
   # Lint Python code
-  cmd ruff check "${@}"
+  docker compose exec web ruff check "${@}"
 }
 
 function test {
   # Run test suite
-  cmd python -m pytest "${@}"
+  docker compose exec web python -m pytest "${@}"
 }
 
 function shell {
   # Start a shell session in the web container
-  cmd bash "${@}"
+  docker compose exec web bash "${@}"
 }
 
 function psql {
   # Connect to PostgreSQL
   # shellcheck disable=SC1091
-  . .env
- docker compose --env-file .env exec -i --tty postgres psql -U "${POSTGRES_USER}" "${@}"
-}
-
-function bash {
-  docker compose --env-file .env exec --tty -i web /bin/bash
+  docker compose exec postgres psql -U "${POSTGRES_USER}" -d "${POSTGRES_DB}" "${@}"
 }
 
 function redis-cli {
   # Connect to Redis
-  _dc redis redis-cli "${@}"
-}
-
-function ci:install-deps {
-  # Install Continuous Integration (CI) dependencies
-  sudo apt-get install -y curl shellcheck
-  sudo curl \
-    -L https://raw.githubusercontent.com/nickjj/wait-until/v0.2.0/wait-until \
-    -o /usr/local/bin/wait-until && sudo chmod +x /usr/local/bin/wait-until
-}
-
-function ci:test {
-  # Execute Continuous Integration (CI) pipeline
-  #
-  # It's expected that your CI environment has these tools available:
-  #   - https://github.com/koalaman/shellcheck
-  #   - https://github.com/nickjj/wait-until
-  shellcheck run bin/*
-  lint:dockerfile "${@}"
-
-  cp --no-clobber .env.example .env
-  cp --no-clobber docker-compose.override.yml.example docker-compose.override.yml
-
-  docker-compose build
-  docker-compose up -d
-
-  # shellcheck disable=SC1091
-  . .env
-  wait-until "docker-compose exec -T \
-    -e PGPASSWORD=${POSTGRES_PASSWORD} postgres \
-    psql -U ${POSTGRES_USER} ${POSTGRES_USER} -c 'SELECT 1'"
-
-  lint "${@}"
-  format --check
-  flask db reset --with-testdb
-  test "${@}"
+  docker compose exec redis redis-cli "${@}"
 }
 
 function help {