From 6c4cf3d273f4246ba6dc0f8a86c56dae767cfb50 Mon Sep 17 00:00:00 2001 From: Ricardo Alanis Date: Mon, 1 Jun 2015 19:34:17 -0500 Subject: [PATCH] added changes to fix printing of json when loading all plugins --- verificadora/filtercsv.py | 4 ---- verificadora/resources.json | 4 +++- verificadora/resources/ISO-8601.py | 2 +- verificadora/resources/column-check.py | 1 - verificadora/verificadora.py | 4 ++-- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/verificadora/filtercsv.py b/verificadora/filtercsv.py index c68a00b..74aad4b 100644 --- a/verificadora/filtercsv.py +++ b/verificadora/filtercsv.py @@ -18,7 +18,6 @@ def detect_lines(filename): def read_top_lines(filename, N): with open(filename,'rb') as fp: head = fp.readlines(N) - print(head) return head def name_id_generator(size=24, chars=string.ascii_uppercase + string.digits): @@ -37,7 +36,6 @@ def generate_random_list(N,n_lines): r_int =random.randint(1,n_lines) r_list.append(r_int) r_list = sorted(r_list) - print(r_list) return r_list def read_random_lines(filename, N,n_lines): @@ -164,7 +162,6 @@ def prepare_csv(csv_requirements,filename,resource,TMP_DIR): unit = "file" sampling = "random" number_units = 0 - print(requirements["unit"]) try: unit = requirements["unit"] # rows, title, file, columns except: @@ -173,6 +170,5 @@ def prepare_csv(csv_requirements,filename,resource,TMP_DIR): if "sampling" in requirements: sampling = requirements["sampling"] #random, first, last if "raw" in requirements: raw = requirements["raw"] if "response" in requirements: raw = csv_requirements["response"] - print(filename,raw,unit,sampling,number_units) temp_data_path = filter_data(filename, raw, unit, sampling, number_units,TMP_DIR) return temp_data_path \ No newline at end of file diff --git a/verificadora/resources.json b/verificadora/resources.json index b2c51f3..7ca62e8 100644 --- a/verificadora/resources.json +++ b/verificadora/resources.json @@ -1,6 +1,8 @@ { "resources": [ "general-file-check.py", - "data-check.py" + "data-check.py", + "ISO-8601.py", + "column-check.py" ] } \ No newline at end of file diff --git a/verificadora/resources/ISO-8601.py b/verificadora/resources/ISO-8601.py index fbb186d..9cc739c 100644 --- a/verificadora/resources/ISO-8601.py +++ b/verificadora/resources/ISO-8601.py @@ -47,7 +47,7 @@ def detect_columns_dates(data): return correct_columns_string def date_validation(data): - """ + """ Validator: Detects if the data has dates in a ISO 8601 compatible format :param data: data to work with. diff --git a/verificadora/resources/column-check.py b/verificadora/resources/column-check.py index f1535b3..fb8d01d 100644 --- a/verificadora/resources/column-check.py +++ b/verificadora/resources/column-check.py @@ -96,7 +96,6 @@ def has_alphanumeric_headers(filepath): reader = csv.reader(f) headers = next(reader) for column_number, column_name in enumerate(headers, start=1): - print(regexp.search(column_name)) if regexp.search(column_name): status = "Fail" reason = """Column name {column_name} in column {column_number} has an invalid name. Please use only letters, numbers, and dashes.""".format(column_name=column_name, column_number=column_number) diff --git a/verificadora/verificadora.py b/verificadora/verificadora.py index 1b6cb01..0d2d146 100644 --- a/verificadora/verificadora.py +++ b/verificadora/verificadora.py @@ -38,9 +38,9 @@ def response_status(response_dict): returns "Pass" otherwise. """ - status = "Fail" + status = "Pass" for response in response_dict.keys(): - if response_dict[response]['status'] == "Pass": status = "Pass" + if response_dict[response]['status'] == "Fail": status = "Fail" return status def verify_morethan11ine(filename):