From a9d13907044f509981b8d076e264d6a354668840 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Thu, 2 Aug 2018 13:44:01 -0400 Subject: [PATCH] Rename assets environment to play nicely with script/setup --- atst/app.py | 4 ++-- atst/assets.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/atst/app.py b/atst/app.py index cd54f15d..46b017bb 100644 --- a/atst/app.py +++ b/atst/app.py @@ -5,7 +5,7 @@ from flask import Flask, request, g from unipath import Path from atst.database import db -from atst.assets import assets +from atst.assets import environment as assets_environment from atst.routes import bp from atst.routes.workspaces import bp as workspace_routes @@ -29,7 +29,7 @@ def make_app(config): make_flask_callbacks(app) db.init_app(app) - assets.init_app(app) + assets_environment.init_app(app) app.register_blueprint(bp) app.register_blueprint(workspace_routes) diff --git a/atst/assets.py b/atst/assets.py index bed898ac..aef6b35e 100644 --- a/atst/assets.py +++ b/atst/assets.py @@ -1,7 +1,7 @@ from flask_assets import Environment, Bundle from atst.home import home -assets = Environment() +environment = Environment() css = Bundle( "../scss/atat.scss", @@ -10,4 +10,4 @@ css = Bundle( depends=("**/*.scss"), ) -assets.register("css", css) +environment.register("css", css)