Fix testSchema.yaml and setup.py issue

Author: ubaumann

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.2.1] - 2017-09-21
+### Fixed
+- Rename testSchema.yaml to test_schema.py
+
 ## [1.2] = 2017-09-20
 ### Added
 - Changelog

nuts/service/file_validator.py

@@ -3,9 +3,10 @@
 
 import logging
 
-import os
 from pykwalify.core import Core, SchemaError
 
+from nuts.service.test_schema import TEST_SCHEMA
+
 
 class FileValidator(object):
     def __init__(self, test_file):
@@ -14,10 +15,8 @@ def __init__(self, test_file):
         self.validation_logger = logging.getLogger('nuts-validation')
 
     def validate(self):
-        cur_dir = os.path.dirname(__file__)
-        test_file = os.path.join(cur_dir, 'testSchema.yaml')
         try:
-            c = Core(source_file=self.test_file, schema_files=[test_file])
+            c = Core(source_file=self.test_file, schema_data=TEST_SCHEMA)
             c.validate(raise_exception=True)
             return True
         except SchemaError as e:

nuts/service/testSchema.yaml renamed to nuts/service/test_schema.py

@@ -1,3 +1,9 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import yaml
+
+SCHEMA = '''
 type: seq
 sequence:
   - type: map
@@ -42,4 +48,7 @@
             save:
               type: str
               required: no
-      teardown: *commands
+      teardown: *commands
+'''
+
+TEST_SCHEMA = yaml.safe_load(SCHEMA)

setup.py

@@ -11,13 +11,12 @@
 readme = open('README.rst').read()
 
 setup(name='nuts',
-      version='1.2',
+      version='1.2.1',
       description='A Network Unit Test System',
       author='Andreas Stalder, David Meister, Matthias Gabriel, Urs Baumann',
       author_email='astalder@hsr.ch, dmeister@hsr.ch, mgabriel@hsr.ch, ubaumann@ins.hsr.ch',
       url='https://github.com/HSRNetwork/Nuts',
       packages=find_packages(),
-      data_files=[('nuts/service', ['nuts/service/testSchema.yaml'])],
       zip_safe=False,
       include_package_data=True,
       license='MIT',