From c9d3ad98f745ad8c01bc9b9fb43a06ad63ddd112 Mon Sep 17 00:00:00 2001
From: Ian H Pittwood <pittwoodian@gmail.com>
Date: Mon, 26 Aug 2019 14:36:28 -0500
Subject: [PATCH] Implement intermediary validation

Adds the options implemented in Spyglass for intermediary validation to
the plugin CLI

Related Change: https://review.opendev.org/#/c/678642/

Depends-On: Iaa385d265b027426f8e5f2376462ffb4c0d1d3fa
Change-Id: I15e348916c14927ff9a5e6a27e55a912f8dd3126
---
 requirements.txt           | 2 +-
 spyglass_plugin_xls/cli.py | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index a834b99..871cd8f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
 click>=7.0
 PyYAML~=5.1
-openpyxl~=2.6.2
+openpyxl==2.6.2
diff --git a/spyglass_plugin_xls/cli.py b/spyglass_plugin_xls/cli.py
index e137ee8..a2e51a4 100644
--- a/spyglass_plugin_xls/cli.py
+++ b/spyglass_plugin_xls/cli.py
@@ -28,7 +28,6 @@ EXCEL_FILE_OPTION = click.option(
     '-x',
     '--excel-file',
     'excel_file',
-    multiple=True,
     type=click.Path(exists=True, readable=True, dir_okay=False),
     required=True,
     help='Path to the engineering Excel file. Required for '
@@ -70,6 +69,8 @@ def excel(*, verbose):
 @EXCEL_SPEC_OPTION
 @cli.SITE_CONFIGURATION_FILE_OPTION
 @cli.INTERMEDIARY_DIR_OPTION
+@cli.INTERMEDIARY_SCHEMA_OPTION
+@cli.NO_INTERMEDIARY_VALIDATION_OPTION
 @cli.SITE_NAME_CONFIGURATION_OPTION
 def generate_intermediary(*args, **kwargs):
     process_input_ob = \
@@ -95,6 +96,8 @@ def generate_intermediary(*args, **kwargs):
 @EXCEL_SPEC_OPTION
 @cli.SITE_CONFIGURATION_FILE_OPTION
 @cli.INTERMEDIARY_DIR_OPTION
+@cli.INTERMEDIARY_SCHEMA_OPTION
+@cli.NO_INTERMEDIARY_VALIDATION_OPTION
 @cli.SITE_NAME_CONFIGURATION_OPTION
 @cli.TEMPLATE_DIR_OPTION
 @cli.MANIFEST_DIR_OPTION