moving validation to load_settings

zappa/cli.py

@@ -786,9 +786,6 @@ def update(self):
         # Make sure we're in a venv.
         self.check_venv()
 
-        # Validate settings
-        self.validate_settings()
-
         # Execute the prebuild script
         if self.prebuild_script:
             self.execute_prebuild_script()
@@ -1843,6 +1840,11 @@ def load_settings(self, settings_file=None, session=None):
         if not os.path.isfile(settings_file):
             raise ClickException("Please configure your zappa_settings file.")
 
+        # Validate settings
+        # Validate timeout seconds
+        if self.stage_config.get('timeout_seconds') > 300:
+              click.echo(click.style("Warning!", fg="red", bold=True) + "`timeout_seconds` must be less or equal to 300!"
+
         # Load up file
         self.load_settings_file(settings_file)
 
@@ -2455,14 +2457,6 @@ def check_venv(self):
                 click.style("Zappa", bold=True) + " requires an " + click.style("active virtual environment", bold=True, fg="red") + "!\n" +
                 "Learn more about virtual environments here: " + click.style("http://docs.python-guide.org/en/latest/dev/virtualenvs/", bold=False, fg="cyan"))
 
-
-    def validate_settings(self):
-        """ Validate settings """
-        # Validate timeout_seconds
-        if self.stage_config.get('timeout_seconds') > 300:
-            click.echo(click.style("Warning!", fg="red", bold=True) + "`timeout_seconds` must be less or equal to 300!"
-
-
     def silence(self):
         """
         Route all stdout to null.