From f423ee31b329a63f50f6c57bef520ba2eabac36c Mon Sep 17 00:00:00 2001 From: Jason Garber Date: Fri, 29 Jun 2018 15:19:16 -0400 Subject: [PATCH] Use webassets' built-in command line builder --- atst/assets.py | 6 +++--- atst/handler.py | 4 ++-- precompile.py | 11 ----------- script/bootstrap | 2 +- 4 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 precompile.py diff --git a/atst/assets.py b/atst/assets.py index 87a17c6d..7f723f75 100644 --- a/atst/assets.py +++ b/atst/assets.py @@ -1,11 +1,11 @@ from webassets import Environment, Bundle from atst.home import home -assets = Environment( +environment = Environment( directory=home.child("scss"), url="/static" ) -print(assets.url_expire) + css = Bundle( "atat.scss", filters="scss", @@ -13,4 +13,4 @@ css = Bundle( depends=("**/*.scss"), ) -assets.register("css", css) +environment.register("css", css) diff --git a/atst/handler.py b/atst/handler.py index be7a5bf4..99ffa0f2 100644 --- a/atst/handler.py +++ b/atst/handler.py @@ -1,8 +1,8 @@ import tornado.web -from atst.assets import assets +from atst.assets import environment from atst.sessions import SessionNotFoundError -helpers = {"assets": assets} +helpers = {"assets": environment} class BaseHandler(tornado.web.RequestHandler): diff --git a/precompile.py b/precompile.py deleted file mode 100644 index 898f8902..00000000 --- a/precompile.py +++ /dev/null @@ -1,11 +0,0 @@ -import logging -from atst.assets import assets -from webassets.script import CommandLineEnvironment - -# Setup a logger -log = logging.getLogger('webassets') -log.addHandler(logging.StreamHandler()) -log.setLevel(logging.DEBUG) - -cmdenv = CommandLineEnvironment(assets, log) -cmdenv.build() diff --git a/script/bootstrap b/script/bootstrap index a21d6fd6..ad26fe47 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -18,4 +18,4 @@ pipenv install --dev npm install # Precompile assets for deployment -pipenv run python ./precompile.py +pipenv run webassets -m atst.assets build