Merge remote-tracking branch 'origin/main' into feature/form_navigation

This commit is contained in:
jasquat 2022-07-21 16:58:07 -04:00
commit 926db5d3bc
2 changed files with 6 additions and 1 deletions

View File

@ -1,4 +1,4 @@
pip==22.1.2
pip==22.2
nox==2022.1.7
nox-poetry==1.0.1
poetry==1.1.14

View File

@ -42,6 +42,11 @@ def setup_config(app: Flask) -> None:
app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
app.config.from_object("spiffworkflow_backend.config.default")
# This allows config/testing.py or instance/config.py to override the default config
if "ENV" in app.config and app.config["ENV"] == "testing":
app.config.from_pyfile("config/testing.py", silent=True)
else:
app.config.from_pyfile(f"{app.instance_path}/config.py", silent=True)
setup_database_uri(app)
setup_logger(app)