Upgrade to Python 3.10; resolve dependency changes; minor refactor.

Author: toddbirchard

.flake8

@@ -0,0 +1,4 @@
+[flake8]
+select = E9,F63,F7,F82
+exclude = .git,.github,__pycache__,.pytest_cache,.venv,logs,creds
+max-line-length = 120

Makefile

@@ -1,6 +1,6 @@
 PROJECT_NAME := $(shell basename $CURDIR)
-VIRTUAL_ENVIRONMENT := $(CURDIR)/.venv
-LOCAL_PYTHON := $(VIRTUAL_ENVIRONMENT)/bin/python3
+VIRTUAL_ENV := $(CURDIR)/.venv
+LOCAL_PYTHON := $(VIRTUAL_ENV)/bin/python3
 
 define HELP
 Manage $(PROJECT_NAME). Usage:
@@ -19,51 +19,54 @@ export HELP
 
 .PHONY: run install deploy update format lint clean help
 
-requirements: .requirements.txt
-env: ./.venv/bin/activate
-
-
-.requirements.txt: requirements.txt
-	$(shell . .venv/bin/activate && pip install -r requirements.txt)
-
-
 all help:
 	@echo "$$HELP"
 
 
+env: $(VIRTUAL_ENV)
+
+$(VIRTUAL_ENV):
+	if [ ! -d $(VIRTUAL_ENV) ]; then \
+		echo "Creating Python virtual env in \`${VIRTUAL_ENV}\`"; \
+		python3 -m venv $(VIRTUAL_ENV); \
+	fi
+
 .PHONY: run
 run: env
-	flask run
+	$(LOCAL_PYTHON) -m gunicorn -w 4 wsgi:app
 
 
-.PHONY: install
-install:
-	if [ ! -d "./.venv" ]; then python3 -m venv $(VIRTUAL_ENVIRONMENT); fi
-	. .venv/bin/activate
-	$(LOCAL_PYTHON) -m pip install --upgrade pip setuptools wheel
-	$(LOCAL_PYTHON) -m pip install -r requirements.txt
+requirements: .requirements.txt
+env: ./.venv/bin/activate
+
 
+.requirements.txt: requirements.txt
+	$(shell . .venv/bin/activate && pip install -r requirements.txt)
+
+.PHONY: install
+install: env
+	$(LOCAL_PYTHON) -m pip install --upgrade pip setuptools wheel && \
+	$(LOCAL_PYTHON) -m pip install -r requirements.txt && \
+	echo Installed dependencies in \`${VIRTUAL_ENV}\`;
 
 .PHONY: deploy
 deploy:
-	make install
+	make install && \
 	make run
 
-
 .PHONY: update
-update:
-	if [ ! -d "./.venv" ]; then python3 -m venv $(VIRTUAL_ENVIRONMENT); fi
-	.venv/bin/python3 -m pip install --upgrade pip setuptools wheel
-	poetry update
-	poetry export -f requirements.txt --output requirements.txt --without-hashes
+update: env
+	$(LOCAL_PYTHON) -m pip install --upgrade pip setuptools wheel && \
+	poetry update && \
+	poetry export -f requirements.txt --output requirements.txt --without-hashes && \
+	echo Installed dependencies in \`${VIRTUAL_ENV}\`;
 
 
 .PHONY: format
 format: env
-	isort --multi-line=3 .
+	isort --multi-line=3 . && \
 	black .
 
-
 .PHONY: lint
 lint:
 	flake8 . --count \
@@ -72,18 +75,20 @@ lint:
 			--show-source \
 			--statistics
 
-
 .PHONY: clean
 clean:
-	find . -name '*.pyc' -delete
-	find . -name '__pycache__' -delete
+	find . -name 'poetry.lock' -delete
+	find . -name '.coverage' -delete
+	find . -name '**/*.pyc' -delete
 	find . -name 'poetry.lock' -delete
 	find . -name '*.log' -delete
 	find . -name '.DS_Store' -delete
-	find . -wholename 'logs/*.json' -delete
-	find . -wholename '.pytest_cache' -delete
-	find . -wholename '**/.pytest_cache' -delete
-	find . -wholename './logs/*.json' -delete
-	find . -wholename './logs' -delete
-	find . -wholename '*.html' -delete
-	find . -wholename '**/.webassets-cache'  -delete
+	find . -wholename '**/*.pyc' -delete
+	find . -wholename '**/*.html' -delete
+	find . -type d -wholename '**/__pycache__/' -exec rm -rf {} \;
+	find . -type d -wholename '.venv' -exec rm -rf {} \;
+	find . -type d -wholename '.pytest_cache' -exec rm -rf {} \;
+	find . -type d -wholename '**/.pytest_cache' -exec rm -rf {} \;
+	find . -type d -wholename '**/*.log' -exec rm -rf {} \;
+	find . -type d -wholename './.reports/*' -exec rm -rf {} \;
+	find . -type d -wholename '**/.webassets-cache/' -exec rm -rf {} \;

README.md

@@ -1,8 +1,8 @@
 # Flask-WTF Tutorial
 
-![Python](https://img.shields.io/badge/Python-v^3.8-blue.svg?logo=python&longCache=true&logoColor=white&colorB=5e81ac&style=flat-square&colorA=4c566a)
-![Flask](https://img.shields.io/badge/Flask-v2.1.1-blue.svg?longCache=true&logo=flask&style=flat-square&logoColor=white&colorB=5e81ac&colorA=4c566a)
-![Flask-WTF](https://img.shields.io/badge/Flask--WTF-v1.0.1-blue.svg?longCache=true&logo=flask&style=flat-square&logoColor=white&colorB=5e81ac&colorA=4c566a)
+![Python](https://img.shields.io/badge/Python-v3.10-blue.svg?logo=python&longCache=true&logoColor=white&colorB=5e81ac&style=flat-square&colorA=4c566a)
+![Flask](https://img.shields.io/badge/Flask-v3.0.0-blue.svg?longCache=true&logo=flask&style=flat-square&logoColor=white&colorB=5e81ac&colorA=4c566a)
+![Flask-WTF](https://img.shields.io/badge/Flask--WTF-v1.2.1-blue.svg?longCache=true&logo=flask&style=flat-square&logoColor=white&colorB=5e81ac&colorA=4c566a)
 ![GitHub Last Commit](https://img.shields.io/github/last-commit/google/skia.svg?style=flat-square&colorA=4c566a&colorB=a3be8c&logo=GitHub)
 [![GitHub Issues](https://img.shields.io/github/issues/hackersandslackers/flask-wtform-tutorial.svg?style=flat-square&colorA=4c566a&logo=GitHub&colorB=ebcb8b)](https://github.com/hackersandslackers/flask-wtform-tutorial/issues)
 [![GitHub Stars](https://img.shields.io/github/stars/hackersandslackers/flask-wtform-tutorial.svg?style=flat-square&colorA=4c566a&logo=GitHub&colorB=ebcb8b)](https://github.com/hackersandslackers/flask-wtform-tutorial/stargazers)
@@ -12,10 +12,10 @@
 
 Handle user input in your Flask app by creating forms with the Flask-WTForm library.
 
-* **Tutorial**: https://hackersandslackers.com/flask-wtforms-forms/
-* **Demo**: https://flaskwtf.hackersandslackers.app/
-=
-# Getting Started
+* **Tutorial**: [https://hackersandslackers.com/flask-wtforms-forms/](https://hackersandslackers.com/flask-wtforms-forms/)
+* **Demo**: [https://flaskwtf.hackersandslackers.app/](https://flaskwtf.hackersandslackers.app/)
+
+## Getting Started
 
 Get set up locally:
 
@@ -24,22 +24,20 @@ Get set up locally:
 Get up and running with `make deploy`:
 
 ```shell
-$ git clone https://github.com/hackersandslackers/flask-wtform-tutorial.git
-$ cd flask-wtform-tutorial
-$ make deploy
-``` 
+git clone https://github.com/hackersandslackers/flask-wtform-tutorial.git
+cd flask-wtform-tutorial
+make deploy
+```
 
 ### Environment Variables
 
 Replace the values in **.env.example** with your values and rename this file to **.env**:
 
-* `FLASK_APP`: Entry point of your application (should be `wsgi.py`).
-* `FLASK_ENV`: The environment to run your app in (either `development` or `production`).
 * `SECRET_KEY`: Randomly generated string of characters used to encrypt your app's data.
+* `FLASK_DEBUG`: Whether to run Flask in "debug" mode (either `True` or `False`).
 
 *Remember never to commit secrets saved in .env files to Github.*
 
-
 -----
 
 **Hackers and Slackers** tutorials are free of charge. If you found this tutorial helpful, a [small donation](https://www.buymeacoffee.com/hackersslackers) would be greatly appreciated to keep us in business. All proceeds go towards coffee, and all coffee goes towards more content.

config.py

@@ -12,9 +12,9 @@ class Config:
     """Set Flask configuration vars from .env file."""
 
     # General Config
+    FLASK_APP = "wsgi.py"
+    FLASK_DEBUG = environ.get("FLASK_DEBUG")
     SECRET_KEY = environ.get("SECRET_KEY")
-    FLASK_APP = environ.get("FLASK_APP")
-    FLASK_ENV = environ.get("FLASK_ENV")
 
     # Static Assets
     STATIC_FOLDER = "static"

deploy.sh

@@ -11,6 +11,6 @@ def create_app():
 
     with app.app_context():
         # Import parts of our flask_wtforms_tutorial
-        from . import routes
+        from flask_wtforms_tutorial import routes
 
         return app

flask_wtforms_tutorial/__init__.py

@@ -2,15 +2,13 @@
 from flask import current_app as app
 from flask import redirect, render_template, url_for
 
-from .forms import ContactForm, SignupForm
+from flask_wtforms_tutorial.forms import ContactForm, SignupForm
 
 
 @app.route("/")
 def home():
     """Landing page."""
-    return render_template(
-        "index.jinja2", template="home-template", title="Flask-WTF tutorial"
-    )
+    return render_template("index.jinja2", template="home-template", title="Flask-WTF tutorial")
 
 
 @app.route("/contact", methods=["GET", "POST"])
@@ -19,9 +17,7 @@ def contact():
     form = ContactForm()
     if form.validate_on_submit():
         return redirect(url_for("success"))
-    return render_template(
-        "contact.jinja2", form=form, template="form-template", title="Contact Form"
-    )
+    return render_template("contact.jinja2", form=form, template="form-template", title="Contact Form")
 
 
 @app.route("/signup", methods=["GET", "POST"])
@@ -30,9 +26,7 @@ def signup():
     form = SignupForm()
     if form.validate_on_submit():
         return redirect(url_for("success"))
-    return render_template(
-        "signup.jinja2", form=form, template="form-template", title="Signup Form"
-    )
+    return render_template("signup.jinja2", form=form, template="form-template", title="Signup Form")
 
 
 @app.route("/success", methods=["GET", "POST"])