Merge pull request #4159 from edx/clytwynec/updating_update_assets_prereqs

stop update_assets commands from being called extra times

pavelib/assets.py

@@ -192,7 +192,10 @@ def watch_assets(options):
 
 
 @task
-@needs('pavelib.prereqs.install_asset_prereqs')
+@needs(
+    'pavelib.prereqs.install_ruby_prereqs',
+    'pavelib.prereqs.install_node_prereqs',
+)
 @consume_args
 def update_assets(args):
     """

pavelib/prereqs.py

@@ -121,6 +121,9 @@ def install_ruby_prereqs():
     """
     Installs Ruby prereqs
     """
+    if os.environ.get("NO_PREREQ_INSTALL", False):
+        return
+
     prereq_cache("Ruby prereqs", ["Gemfile"], ruby_prereqs_installation)
 
 
@@ -129,6 +132,9 @@ def install_node_prereqs():
     """
     Installs Node prerequisites
     """
+    if os.environ.get("NO_PREREQ_INSTALL", False):
+        return
+
     prereq_cache("Node prereqs", ["package.json"], node_prereqs_installation)
 
 
@@ -137,6 +143,9 @@ def install_python_prereqs():
     """
     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)
 
 
@@ -151,15 +160,3 @@ def install_prereqs():
     install_ruby_prereqs()
     install_node_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()
-