From a2287813de521de144cc05c2ceb00d87da136c17 Mon Sep 17 00:00:00 2001 From: Hamid Musavi Date: Fri, 5 Apr 2019 17:01:55 -0400 Subject: [PATCH] ODE-1234 included config.ini in the package --- odevalidator/validator.py | 10 ++++------ setup.py | 6 ++++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/odevalidator/validator.py b/odevalidator/validator.py index f37e6e9..50b3e5e 100644 --- a/odevalidator/validator.py +++ b/odevalidator/validator.py @@ -107,7 +107,7 @@ def check_value(self, data_field_value, data): class TestCase: - def __init__(self, filepath): + def __init__(self, filepath="odevalidator/config.ini"): assert Path(filepath).is_file(), "Configuration file '%s' could not be found" % filepath self.config = configparser.ConfigParser() self.config.read(filepath) @@ -134,7 +134,7 @@ def validate_queue(self, msg_queue): msg_list = [] while not msg_queue.empty(): line = msg_queue.get() - if line and not line.startswith("#"): + if line and not str.startswith(str(line), '#'): current_msg = json.loads(line) msg_list.append(current_msg) record_id = str(current_msg['metadata']['serialId']['recordId']) @@ -167,11 +167,9 @@ def validate_queue(self, msg_queue): # main function using old functionality def test(): - config_file = "odevalidator/config.ini" + #config_file = "odevalidator/config.ini" # Parse test config and create test case - validator = TestCase(config_file) - - print("[START] Beginning test routine referencing configuration file '%s'." % config_file) + validator = TestCase() data_file = "test/good.json" results = test_file(validator, data_file) diff --git a/setup.py b/setup.py index 0e88b32..aa88ba3 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,11 @@ -from setuptools import setup +from setuptools import setup, find_packages setup( name="odevalidator", version="0.0.2", author_email="fake@email.com", description="ODE Data Validation Library", - packages=['odevalidator'] + packages=['odevalidator'], + package_data={'': ['config.ini']}, + include_package_data=True, )