diff --git a/.github/workflows/constraints.txt b/.github/workflows/constraints.txt index e351201d..90aa9d15 100644 --- a/.github/workflows/constraints.txt +++ b/.github/workflows/constraints.txt @@ -1,4 +1,4 @@ -pip==22.1.2 +pip==22.2 nox==2022.1.7 nox-poetry==1.0.1 poetry==1.1.14 diff --git a/src/spiffworkflow_backend/config/__init__.py b/src/spiffworkflow_backend/config/__init__.py index 832a4578..3c033555 100644 --- a/src/spiffworkflow_backend/config/__init__.py +++ b/src/spiffworkflow_backend/config/__init__.py @@ -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)