From 8593d1328ea682c57c2172b6facdc90fd1b570b2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 02:04:49 +0000
Subject: [PATCH 1/2] chore(deps): update python

---
 resources/requirements.txt | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/resources/requirements.txt b/resources/requirements.txt
index 0d286c2..744d86b 100644
--- a/resources/requirements.txt
+++ b/resources/requirements.txt
@@ -1,29 +1,29 @@
 boto3==1.35.45
 botocore==1.35.45
 certifi==2024.8.30
-chardet==3.0.4
-click==6.7
+chardet==5.2.0
+click==8.1.7
 docutils==0.21.2
 Flask==1.1.2
-Flask-SQLAlchemy==2.5.1
-google-api-python-client==1.12.11
+Flask-SQLAlchemy==3.1.1
+google-api-python-client==2.149.0
 httplib2==0.22.0
 idna==3.10
-itsdangerous==0.24
+itsdangerous==2.2.0
 Jinja2==2.11.3
-jmespath==0.10.0
-MarkupSafe==1.1.1
+jmespath==1.0.1
+MarkupSafe==3.0.2
 oauth2client==4.1.3
 psycopg2==2.9.10
 pyasn1==0.6.1
 pyasn1-modules==0.4.1
-pyparsing==2.4.7
+pyparsing==3.2.0
 python-dateutil==2.9.0.post0
 requests==2.32.3
 rsa==4.9
 s3transfer==0.10.3
 six==1.16.0
-SQLAlchemy==1.4.54
-uritemplate==3.0.1
-urllib3==1.26.20
+SQLAlchemy==2.0.36
+uritemplate==4.1.1
+urllib3==2.2.3
 Werkzeug==0.15.3

From 78c3b44d37372bbba810564aa62d93de7610a11a Mon Sep 17 00:00:00 2001
From: Matt Wise <diranged@users.noreply.github.com>
Date: Tue, 22 Oct 2024 09:41:34 -0700
Subject: [PATCH 2/2] fix

---
 README.md                  | 16 ++++++++++++++++
 resources/requirements.txt |  6 +++---
 src/app.py                 |  3 +--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 92f83e1..c284edd 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,22 @@ Built with Flask, Python 3.6, with Postgres and Google OAuth.
 
 ## Local development
 
+## Prereq (Mac/M1)
+
+Must install the Postgres development libraries in order to properly build a
+Virtual Environment for Python with Pyscopg2:
+
+```bash
+% brew install postgresql
+
+==> Downloading https://formulae.brew.sh/api/formula.jws.json
+...
+% make venv
+...
+```
+
+## Database Setup
+
 Uses docker.
 
 Run `make db` to initialize the database first.
diff --git a/resources/requirements.txt b/resources/requirements.txt
index 744d86b..5d10b02 100644
--- a/resources/requirements.txt
+++ b/resources/requirements.txt
@@ -4,13 +4,13 @@ certifi==2024.8.30
 chardet==5.2.0
 click==8.1.7
 docutils==0.21.2
-Flask==1.1.2
+Flask==2.2.5
 Flask-SQLAlchemy==3.1.1
 google-api-python-client==2.149.0
 httplib2==0.22.0
 idna==3.10
 itsdangerous==2.2.0
-Jinja2==2.11.3
+Jinja2==3.1.4
 jmespath==1.0.1
 MarkupSafe==3.0.2
 oauth2client==4.1.3
@@ -26,4 +26,4 @@ six==1.16.0
 SQLAlchemy==2.0.36
 uritemplate==4.1.1
 urllib3==2.2.3
-Werkzeug==0.15.3
+Werkzeug==3.0.3
diff --git a/src/app.py b/src/app.py
index 26c1040..8d92544 100644
--- a/src/app.py
+++ b/src/app.py
@@ -1,7 +1,7 @@
 import os
 
 from flask import Flask, g
-from werkzeug.contrib.fixers import ProxyFix
+from werkzeug.middleware.proxy_fix import ProxyFix
 from werkzeug.routing import BaseConverter
 
 import auth
@@ -63,6 +63,5 @@ def __init__(self, url_map, *items):
 db.init_app(app)
 
 if __name__ == "__main__":
-    db.init_app(app)
     auth.init_app(app)
     app.run()