Commit 245ed42d by Christine Lytwynec

stop update_assets commands from being called extra times

parent bba85e80
...@@ -190,7 +190,10 @@ def watch_assets(options): ...@@ -190,7 +190,10 @@ def watch_assets(options):
@task @task
@needs('pavelib.prereqs.install_asset_prereqs') @needs(
'pavelib.prereqs.install_ruby_prereqs',
'pavelib.prereqs.install_node_prereqs',
)
@consume_args @consume_args
def update_assets(args): def update_assets(args):
""" """
......
...@@ -121,6 +121,9 @@ def install_ruby_prereqs(): ...@@ -121,6 +121,9 @@ def install_ruby_prereqs():
""" """
Installs Ruby prereqs Installs Ruby prereqs
""" """
if os.environ.get("NO_PREREQ_INSTALL", False):
return
prereq_cache("Ruby prereqs", ["Gemfile"], ruby_prereqs_installation) prereq_cache("Ruby prereqs", ["Gemfile"], ruby_prereqs_installation)
...@@ -129,6 +132,9 @@ def install_node_prereqs(): ...@@ -129,6 +132,9 @@ def install_node_prereqs():
""" """
Installs Node prerequisites Installs Node prerequisites
""" """
if os.environ.get("NO_PREREQ_INSTALL", False):
return
prereq_cache("Node prereqs", ["package.json"], node_prereqs_installation) prereq_cache("Node prereqs", ["package.json"], node_prereqs_installation)
...@@ -137,6 +143,9 @@ def install_python_prereqs(): ...@@ -137,6 +143,9 @@ def install_python_prereqs():
""" """
Installs Python prerequisites Installs Python prerequisites
""" """
if os.environ.get("NO_PREREQ_INSTALL", False):
return
prereq_cache("Python prereqs", PYTHON_REQ_FILES + [sysconfig.get_python_lib()], python_prereqs_installation) prereq_cache("Python prereqs", PYTHON_REQ_FILES + [sysconfig.get_python_lib()], python_prereqs_installation)
...@@ -151,15 +160,3 @@ def install_prereqs(): ...@@ -151,15 +160,3 @@ def install_prereqs():
install_ruby_prereqs() install_ruby_prereqs()
install_node_prereqs() install_node_prereqs()
install_python_prereqs() install_python_prereqs()
@task
def install_asset_prereqs():
"""
Installs Ruby and Node
"""
if os.environ.get("NO_PREREQ_INSTALL", False):
return
install_ruby_prereqs()
install_node_prereqs()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment