Upgrade to Python3.10.

Author: toddbirchard

.env.example

@@ -1,9 +1,16 @@
-ENVIRONMENT=development
-FLASK_APP=wsgi.py
+ENVIRONMENT=production
+FLASK_APP=main.py
 FLASK_DEBUG=True
-SECRET_KEY=yoursecretkey
-SQLALCHEMY_DATABASE_URI=mysql+pymysql://myuser:mypassword@host.example.com:1234/mydatabase
+SECRET_KEY=HGFDGGUFCJHDJCWDGCKDWWW
+
 REDIS_URI=redis://:password@host.com:1234
-COMPRESSOR_DEBUG=True
+
+SQLALCHEMY_DATABASE_URI=mysql+pymysql://myuser:mypassword@host.example.com:1234/mydatabase
+SQLALCHEMY_TRACK_MODIFICATIONS=False
+SQLALCHEMY_CA_CERTS="./certificate.crt"
+
 ASSETS_DEBUG=False
 LESS_RUN_IN_DEBUG=False
+COMPRESSOR_DEBUG=False
+ASSETS_DEBUG=False
+LESS_RUN_IN_DEBUG=False

.gitignore

@@ -88,6 +88,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+.creds/
 
 # Spyder project settings
 .spyderproject

Makefile

@@ -7,7 +7,6 @@ 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.
@@ -17,44 +16,31 @@ endef
 export HELP
 
 
-.PHONY: run install deploy update format lint clean help
-
+.PHONY: run install update format lint clean help
 
 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
 	export LESS_BIN=$(shell which lessc) && \
-	uwsgi --http 127.0.0.1:8082 --master --module wsgi:app --processes 4 --threads 2
-
+	$(LOCAL_PYTHON) -m main
 
 .PHONY: install
 install: env
 	$(LOCAL_PYTHON) -m pip install --upgrade pip setuptools wheel && \
-	$(LOCAL_PYTHON) -m pip install --no-cache-dir uwsgi && \
 	$(LOCAL_PYTHON) -m pip install -r requirements.txt && \
 	npm i -g less && \
 	echo Installed dependencies in \`${VIRTUAL_ENV}\`;
 
-
-.PHONY: deploy
-deploy:
-	make install
-	make run
-
-
 .PHONY: test
 test: env
 	$(LOCAL_PYTHON) -m \
@@ -63,22 +49,18 @@ test: env
 		coverage html --title='Coverage Report' -d .reports && \
 		open .reports/index.html
 
-
 .PHONY: update
 update: env
 	$(LOCAL_PYTHON) -m pip install --upgrade pip setuptools wheel && \
-	$(LOCAL_PYTHON) -m pip install --no-cache-dir uwsgi && \
 	poetry update && \
 	poetry export -f requirements.txt --output requirements.txt --without-hashes && \
 	echo Installed dependencies in \`${VIRTUAL_ENV}\`;
 
-
 .PHONY: format
 format: env
 	$(LOCAL_PYTHON) -m isort --multi-line=3 . && \
 	$(LOCAL_PYTHON) -m black .
 
-
 .PHONY: lint
 lint: env
 	$(LOCAL_PYTHON) -m flake8 . --count \
@@ -87,7 +69,6 @@ lint: env
 			--show-source \
 			--statistics
 
-
 .PHONY: clean
 clean:
 	find . -name 'poetry.lock' -delete && \
@@ -98,12 +79,12 @@ clean:
 	find . -name '*.log' -delete \
 	find . -name '.DS_Store' -delete \
 	find . -wholename '**/*.pyc' -delete && \
-	find . -wholename '*.html' -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 './logs/*' -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,10 +1,10 @@
 # Flask-Session Tutorial
 
-![Python](https://img.shields.io/badge/Python-v^3.9-blue.svg?logo=python&longCache=true&logoColor=white&colorB=5e81ac&style=flat-square&colorA=4c566a)
-![Flask](https://img.shields.io/badge/Flask-v^2.2.2-blue.svg?longCache=true&logo=flask&style=flat-square&logoColor=white&colorB=5e81ac&colorA=4c566a)
+![Python](https://img.shields.io/badge/Python-v^3.10-blue.svg?logo=python&longCache=true&logoColor=white&colorB=5e81ac&style=flat-square&colorA=4c566a)
+![Flask](https://img.shields.io/badge/Flask-v^2.3.3-blue.svg?longCache=true&logo=flask&style=flat-square&logoColor=white&colorB=5e81ac&colorA=4c566a)
 ![Flask-Login](https://img.shields.io/badge/Flask--Login-v0.6.2-blue.svg?longCache=true&logo=flask&style=flat-square&logoColor=white&colorB=5e81ac&colorA=4c566a)
-![Flask-Session](https://img.shields.io/badge/Flask--Session-v0.4.0-blue.svg?longCache=true&logo=flask&style=flat-square&logoColor=white&colorB=5e81ac&colorA=4c566a)
-![Redis](https://img.shields.io/badge/Redis-v4.4.2-red.svg?longCache=true&style=flat-square&logo=redis&logoColor=white&colorA=4c566a&colorB=bf616a)
+![Flask-Session](https://img.shields.io/badge/Flask--Session-v0.5.0-blue.svg?longCache=true&logo=flask&style=flat-square&logoColor=white&colorB=5e81ac&colorA=4c566a)
+![Redis](https://img.shields.io/badge/Redis-v5.0.0-red.svg?longCache=true&style=flat-square&logo=redis&logoColor=white&colorA=4c566a&colorB=bf616a)
 ![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-session-tutorial.svg?style=flat-square&colorA=4c566a&logo=GitHub&colorB=ebcb8b)](https://github.com/hackersandslackers/flask-session-tutorial/issues)
 [![GitHub Stars](https://img.shields.io/github/stars/hackersandslackers/flask-session-tutorial.svg?style=flat-square&colorA=4c566a&logo=GitHub&colorB=ebcb8b)](https://github.com/hackersandslackers/flask-session-tutorial/stargazers)
@@ -22,7 +22,7 @@ Get set up locally in two steps:
 
 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_APP`: Entry point of your application; should be `main.py`.
 * `FLASK_DEBUG`: Toggle debug mode on (`True`) or off (`False`).
 * `SECRET_KEY`: Randomly generated string of characters used to encrypt your app's data.
 * `SQLALCHEMY_DATABASE_URI`: Connection URI of a SQL database.
@@ -46,4 +46,4 @@ make deploy
 
 -----
 
-**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.

config.py

@@ -35,4 +35,4 @@ class Config:
     # Flask-SQLAlchemy
     SQLALCHEMY_DATABASE_URI = environ.get("SQLALCHEMY_DATABASE_URI")
     SQLALCHEMY_TRACK_MODIFICATIONS = False
-    SQLALCHEMY_ECHO = True
+    SQLALCHEMY_ECHO = False

flask_session_tutorial/models.py

@@ -9,6 +9,7 @@ class User(UserMixin, db.Model):
     """Model for user accounts."""
 
     __tablename__ = "flasksession-users"
+
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String(200), nullable=False, unique=False)
     email = db.Column(db.String(40), unique=True, nullable=False)
@@ -26,4 +27,4 @@ def check_password(self, password):
         return check_password_hash(self.password, password)
 
     def __repr__(self):
-        return "<User {}>".format(self.name)
+        return f"<User id={self.id}, name={self.name}, email={self.email}>"

wsgi.py renamed to main.py

@@ -3,5 +3,5 @@
 
 app = create_app()
 
-if __name__ == "__wsgi__":
-    app.run(host="127.0.0.1")
+if __name__ == "__main__":
+    app.run(host="127.0.0.1", port=8082, load_dotenv=True)