From d199f975e8c5903d14f7692718ad281611488a97 Mon Sep 17 00:00:00 2001
From: Geoff Newson <gnewson@redhat.com>
Date: Mon, 17 Apr 2023 21:19:30 +0100
Subject: [PATCH] Updating requirements to latest for python 3.10

---
 requirements.txt | 30 +++++++++++++++++-------------
 wsgi.py          | 17 ++++++++---------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 273f28ca..e26a4ae9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,15 +1,19 @@
-Flask==0.12
+certifi==2022.12.7
+charset-normalizer==3.1.0
+click==8.1.3
+dominate==2.7.0
+Flask==2.2.3
 Flask-Bootstrap==3.3.7.1
-Flask-SQLAlchemy==2.2
-Jinja2==2.9.5
-MarkupSafe==1.0
-MySQL-python==1.2.5
-SQLAlchemy==1.1.6
-Werkzeug==0.12.1
-click==6.7
-dominate==2.3.1
-gunicorn==19.7.0
-itsdangerous==0.24
+Flask-SQLAlchemy==3.0.3
+greenlet==2.0.2
+idna==3.4
+itsdangerous==2.1.2
+Jinja2==3.1.2
+MarkupSafe==2.1.2
+PyMySQL==1.0.3
+requests==2.28.2
+SQLAlchemy==2.0.9
+typing_extensions==4.5.0
+urllib3==1.26.15
 visitor==0.1.3
-requests==2.13.0
-wsgiref==0.1.2
+Werkzeug==2.2.3
diff --git a/wsgi.py b/wsgi.py
index 391dc73c..fcdca3a1 100644
--- a/wsgi.py
+++ b/wsgi.py
@@ -1,12 +1,12 @@
-from flask import Flask, render_template, request, jsonify
-from flask_sqlalchemy import SQLAlchemy
-from flask_bootstrap import Bootstrap
-from datetime import datetime
 import os
+import random
 import re
+from datetime import datetime
+
 import requests
-import json
-import random
+from flask import Flask, jsonify, request
+from flask_bootstrap import Bootstrap
+from flask_sqlalchemy import SQLAlchemy
 
 user = os.environ["MYSQL_USER"]
 passwd = os.environ["MYSQL_PASSWORD"]
@@ -15,7 +15,7 @@
 
 application = Flask(__name__)
 application.config['SQLALCHEMY_DATABASE_URI'] = \
-  'mysql://%s:%s@%s/%s' % (user, passwd, dbhost, dbname)
+  'mysql+pymysql://%s:%s@%s/%s' % (user, passwd, dbhost, dbname)
 
 application.config['SQLALCHEMY_COMMIT_ON_TEARDOWN'] = True
 application.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
@@ -169,7 +169,7 @@ def press():
 
   # remove the existing state from the states list
   states.remove(row.pollutionLevel)
-  print states
+  print(states)
 
   row.timestamp = timestamp
   row.pollutionLevel = random.choice(states)
@@ -185,7 +185,6 @@ def press():
   return jsonify({"ButtonPress":"Success"})
 
 
-
 if __name__ == "__main__":
   application.run(debug=True)