Update dependencies; update Python version; resolve image in README.

Author: toddbirchard

.github/img/flask-jinja@2x.jpg

@@ -134,6 +134,7 @@ __pycache__
 
 # PyCharm
 .idea
+.vscode
 
 # Virtual environment
 .venv/

.gitignore

@@ -1,58 +1,98 @@
-SRCPATH := $(CURDIR)
-PROJECTNAME := $(shell basename $(CURDIR))
+PROJECT_NAME := $(shell basename $CURDIR)
+VIRTUAL_ENV := $(CURDIR)/.venv
+LOCAL_PYTHON := $(VIRTUAL_ENV)/bin/python3
 
 define HELP
-Manage $(PROJECTNAME). Usage:
+Manage $(PROJECT_NAME). Usage:
+
+make run        - Run $(PROJECT_NAME) locally.
+make install    - Create local virtualenv & install dependencies.
+make deploy     - Set up project & run locally.
+make update     - Update dependencies via Poetry and output resulting `requirements.txt`.
+make format     - Run Python code formatter & sort dependencies.
+make lint       - Check code formatting with flake8.
+make clean      - Remove extraneous compiled files, caches, logs, etc.
 
-make run        - Run $(PROJECTNAME).
-make deploy     - Install requirements and run app for the first time.
-make update     - Update pip dependencies via Python Poetry.
-make format     - Format code with Python's `Black` library.
-make clean      - Remove cached files and lock files.
 endef
 export HELP
 
-.PHONY: run restart deploy update clean help
-
-
-requirements: .requirements.txt
-
-
-.requirements.txt: requirements.txt
-	$(shell . .venv/bin/activate && pip install -r requirements.txt)
 
+.PHONY: run install deploy update format lint clean help
 
 all help:
 	@echo "$$HELP"
 
+env: $(VIRTUAL_ENV)
 
-.PHONY: run
-run:
-	$(shell . .venv/bin/activate && python3 wsgi.py)
+$(VIRTUAL_ENV):
+	if [ ! -d $(VIRTUAL_ENV) ]; then \
+		echo "Creating Python virtual env in \`${VIRTUAL_ENV}\`"; \
+		python3 -m venv $(VIRTUAL_ENV); \
+	fi
+
+.PHONY: dev
+dev: env
+	$(LOCAL_PYTHON) -m main --reload
 
+.PHONY: run
+run: env
+	  $(LOCAL_PYTHON) -m main
+
+.PHONY: install
+install: env
+	$(LOCAL_PYTHON) -m pip install --upgrade pip setuptools wheel && \
+	LDFLAGS="-L$(/opt/homebrew/bin/brew --prefix openssl)/lib -L$(/opt/homebrew/bin/brew --prefix re2)/lib" && \
+	CPPFLAGS="-I$(/opt/homebrew/bin/brew --prefix openssl)/include -I$(/opt/homebrew/bin/brew --prefix re2)/include" && \
+	GRPC_BUILD_WITH_BORING_SSL_ASM="" && \
+	GRPC_PYTHON_BUILD_SYSTEM_RE2=true && \
+	GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=true && \
+	GRPC_PYTHON_BUILD_SYSTEM_ZLIB=true && \
+	pip install grpcio && \
+	$(LOCAL_PYTHON) -m pip install -r requirements.txt && \
+	echo Installed dependencies in \`${VIRTUAL_ENV}\`;
 
 .PHONY: deploy
 deploy:
-	$(shell . ./deploy.sh)
+	make install && \
+	make run
 
+.PHONY: test
+test: env
+	$(LOCAL_PYTHON) -m \
+		coverage run -m pytest -vv \
+		--disable-pytest-warnings && \
+		coverage html --title='Coverage Report' -d .reports && \
+		open .reports/index.html
 
 .PHONY: update
-update:
-	poetry shell && poetry update
-	pip freeze > requirements.txt
-	exit
-
+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: requirements
-	$(shell . .venv/bin/activate)
-	$(shell isort -rc ./)
-	$(shell black ./)
-
+format: env
+	$(LOCAL_PYTHON) -m isort --multi-line=3 . && \
+	$(LOCAL_PYTHON) -m black .
+
+.PHONY: lint
+lint: env
+	$(LOCAL_PYTHON) -m flake8 . --count \
+			--select=E9,F63,F7,F82 \
+			--exclude .git,.github,__pycache__,.pytest_cache,.venv,logs,creds,.venv,docs,logs,.reports \
+			--show-source \
+			--statistics
 
 .PHONY: clean
 clean:
-	find . -name '*.pyc' -delete
-	find . -name '__pycache__' -delete
-	find . -name 'poetry.lock' -delete
-	find . -name 'Pipefile.lock' -delete
+	find . -name 'poetry.lock' -delete && \
+	find . -name '.coverage' -delete && \
+	find . -name '.Pipfile.lock' -delete && \
+	find . -wholename '**/*.pyc' -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 './logs/*.log' -exec rm -rf {} + && \
+	find . -type d -wholename './.reports/*' -exec rm -rf {} +

Makefile

@@ -1,25 +1,26 @@
 # Flask Jinja Tutorial
 
-![Python](https://img.shields.io/badge/Python-v3.8-blue.svg?logo=python&longCache=true&logoColor=white&colorB=5e81ac&style=flat-square&colorA=4c566a)
-![Flask](https://img.shields.io/badge/Flask-v1.1.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-v2.3.3-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-jinja-tutorial.svg?style=flat-square&colorA=4c566a&logo=GitHub&colorB=ebcb8b)](https://github.com/hackersandslackers/flask-jinja-tutorial/issues)
 [![GitHub Stars](https://img.shields.io/github/stars/hackersandslackers/flask-jinja-tutorial.svg?style=flat-square&colorA=4c566a&logo=GitHub&colorB=ebcb8b)](https://github.com/hackersandslackers/flask-jinja-tutorial/stargazers)
 [![GitHub Forks](https://img.shields.io/github/forks/hackersandslackers/flask-jinja-tutorial.svg?style=flat-square&colorA=4c566a&logo=GitHub&colorB=ebcb8b)](https://github.com/hackersandslackers/flask-jinja-tutorial/network)
 
-![Flask Jinja Tutorial](https://storage.googleapis.com/hackersandslackers-cdn/2019/02/jinja@2x.jpg)
+![Flask Jinja Tutorial](.github/img/flask-jinja@2x.jpg)
 
-Source code for the accompanying tutorial found here: https://hackersandslackers.com/flask-jinja-templates/
+Source code for the accompanying tutorial found here: [https://hackersandslackers.com/flask-jinja-templates/](https://hackersandslackers.com/flask-jinja-templates/)
 
 ## Installation
 
-Get up and running with `make deploy`:
+Get up and running with `make run`:
 
 ```shell
-$ git clone https://github.com/hackersandslackers/flask-assets-tutorial.git
-$ cd flask-assets-tutorial
-$ make deploy
-``` 
+git clone https://github.com/hackersandslackers/flask-assets-tutorial.git
+cd flask-assets-tutorial
+make run
+```
+
 -----
 
-**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.
+**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.

Pipfile

@@ -7,6 +7,6 @@ def create_app():
     app = Flask(__name__, template_folder="templates")
 
     with app.app_context():
-        from . import routes
+        from flask_jinja_tutorial import routes
 
         return app

Pipfile.lock

@@ -12,7 +12,7 @@ def home():
         {"name": "Pics", "url": "https://example.com/3"},
     ]
     return render_template(
-        "home.html",
+        "home.jinja2",
         nav=nav,
         title="Jinja Demo Site",
         description="Smarter page templates with Flask & Jinja.",