Move apps schema to it's own python package

apps_schema/__init__.py

@@ -0,0 +1 @@
+# FIXME: We need to account for migration apps_schema

apps_validation/schema/attrs/array.py → apps_schema/attrs/array.py

@@ -12,7 +12,7 @@ def __init__(self, data):
         self._skip_data_values = ['items']
 
     def initialize_values(self, data):
-        from apps_validation.schema.variable import Variable
+        from apps_schema.variable import Variable
         super().initialize_values(data)
         self.items = [Variable(d) for d in (data.get('items') or [])]
 

apps_validation/schema/attrs/base.py → apps_schema/attrs/base.py

@@ -58,7 +58,7 @@ def validate(self, schema, data=None):
         verrors.check()
 
         if '$ref' in self._schema_data:
-            from apps_validation.schema.features import FEATURES
+            from apps_schema.features import FEATURES
             for index, ref in enumerate(self._schema_data['$ref']):
                 if not isinstance(ref, str):
                     verrors.add(f'{schema}.$ref.{index}', 'Must be a string')

apps_validation/schema/attrs/dictionary.py → apps_schema/attrs/dictionary.py

@@ -12,7 +12,7 @@ def __init__(self, data):
         self._skip_data_values = ['attrs']
 
     def initialize_values(self, data):
-        from apps_validation.schema.variable import Variable
+        from apps_schema.variable import Variable
         super().initialize_values(data)
         self.attrs = [Variable(d) for d in (data.get('attrs') or [])]
 

apps_validation/schema/features/acl.py → apps_schema/features/acl.py

@@ -1,4 +1,4 @@
-from apps_validation.schema.attrs import DictSchema
+from apps_schema.attrs import DictSchema
 
 from .base import BaseFeature
 

apps_validation/schema/features/basic.py → apps_schema/features/basic.py

@@ -1,4 +1,4 @@
-from apps_validation.schema.attrs import DictSchema, StringSchema
+from apps_schema.attrs import DictSchema, StringSchema
 
 from .base import BaseFeature
 

apps_validation/schema/features/certificate.py → apps_schema/features/certificate.py

@@ -1,4 +1,4 @@
-from apps_validation.schema.attrs import IntegerSchema
+from apps_schema.attrs import IntegerSchema
 
 from .base import BaseFeature
 

apps_validation/schema/features/container_image.py → apps_schema/features/container_image.py

@@ -1,4 +1,4 @@
-from apps_validation.schema.attrs import DictSchema, StringSchema
+from apps_schema.attrs import DictSchema, StringSchema
 
 from .base import BaseFeature
 

apps_validation/schema/features/interface.py → apps_schema/features/interface.py

@@ -1,4 +1,4 @@
-from apps_validation.schema.attrs import DictSchema, StringSchema
+from apps_schema.attrs import DictSchema, StringSchema
 
 from .base import BaseFeature
 

apps_validation/schema/features/ix_volume.py → apps_schema/features/ix_volume.py

@@ -1,4 +1,4 @@
-from apps_validation.schema.attrs import DictSchema, StringSchema
+from apps_schema.attrs import DictSchema, StringSchema
 
 from .base import BaseFeature
 

apps_validation/schema/features/node.py → apps_schema/features/node.py

@@ -1,4 +1,4 @@
-from apps_validation.schema.attrs import IntegerSchema, StringSchema
+from apps_schema.attrs import IntegerSchema, StringSchema
 
 from .base import BaseFeature
 

apps_validation/ci/git.py

@@ -2,11 +2,11 @@
 import subprocess
 from collections import defaultdict
 
+from apps_validation.exceptions import CatalogDoesNotExist
 from catalog_reader.dev_directory import (
     DEV_DIRECTORY_RELATIVE_PATH, get_ci_development_directory, OPTIONAL_METADATA_FILES
 )
 from catalog_reader.train_utils import is_train_valid
-from apps_validation.exceptions import CatalogDoesNotExist
 
 
 def get_changed_apps(catalog_path: str, base_branch: str = 'master') -> dict:

apps_validation/pytest/unit/test_attr_schema.py

@@ -1,7 +1,7 @@
 import pytest
 
+from apps_schema.attrs import get_schema
 from apps_validation.exceptions import ValidationErrors
-from apps_validation.schema.attrs import get_schema
 
 
 @pytest.mark.parametrize('schema,should_work', [

apps_validation/scripts/catalog_update.py

@@ -8,16 +8,16 @@
 
 from jsonschema import validate as json_schema_validate, ValidationError as JsonValidationError
 
+from apps_validation.ci.names import CACHED_CATALOG_FILE_NAME, CACHED_VERSION_FILE_NAME
+from apps_validation.exceptions import ValidationErrors
+from apps_validation.validation.json_schema_utils import CATALOG_JSON_SCHEMA
+from apps_validation.validation.validate_app_version import validate_catalog_item_version_data
 from catalog_reader.catalog import retrieve_train_names, retrieve_trains_data, get_apps_in_trains
 from catalog_reader.dev_directory import (
     get_app_version, get_ci_development_directory, get_to_keep_versions, OPTIONAL_METADATA_FILES,
     REQUIRED_METADATA_FILES, version_has_been_bumped,
 )
 from catalog_reader.train_utils import get_train_path
-from apps_validation.ci.names import CACHED_CATALOG_FILE_NAME, CACHED_VERSION_FILE_NAME
-from apps_validation.exceptions import ValidationErrors
-from apps_validation.validation.json_schema_utils import CATALOG_JSON_SCHEMA
-from apps_validation.validation.validate_app_version import validate_catalog_item_version_data
 
 
 def get_trains(location: str) -> typing.Tuple[dict, dict]:

apps_validation/validation/validate_app_version.py

@@ -5,8 +5,8 @@
 from jsonschema import validate as json_schema_validate, ValidationError as JsonValidationError
 from semantic_version import Version
 
-from catalog_reader.questions_util import CUSTOM_PORTALS_KEY
 from apps_validation.exceptions import ValidationErrors
+from catalog_reader.questions_util import CUSTOM_PORTALS_KEY
 
 from .app_version import validate_app_version_file
 from .ix_values import validate_ix_values_schema

apps_validation/validation/validate_catalog.py

@@ -5,8 +5,8 @@
 from jsonschema import validate as json_schema_validate, ValidationError as JsonValidationError
 
 from apps_validation.ci.names import CACHED_CATALOG_FILE_NAME
-from catalog_reader.train_utils import get_train_path
 from apps_validation.exceptions import CatalogDoesNotExist, ValidationErrors
+from catalog_reader.train_utils import get_train_path
 
 from .json_schema_utils import CATALOG_JSON_SCHEMA
 from .validate_app_rename_migrations import validate_migrations

apps_validation/validation/validate_dev_directory.py

@@ -3,12 +3,12 @@
 
 from jsonschema import ValidationError as JsonValidationError
 
+from apps_validation.exceptions import ValidationErrors
 from catalog_reader.dev_directory import (
     get_app_version, get_ci_development_directory, get_to_keep_versions, REQUIRED_METADATA_FILES,
     version_has_been_bumped,
 )
 from catalog_reader.names import UPGRADE_STRATEGY_FILENAME, TO_KEEP_VERSIONS
-from apps_validation.exceptions import ValidationErrors
 
 from .app_version import validate_app_version_file
 from .validate_app_version import validate_catalog_item_version

apps_validation/validation/validate_questions.py

@@ -1,10 +1,10 @@
 import typing
 import yaml
 
+from apps_schema.variable import Variable
+from apps_validation.exceptions import ValidationErrors
 from catalog_reader.questions import CUSTOM_PORTALS_ENABLE_KEY, CUSTOM_PORTAL_GROUP_KEY
 from catalog_reader.questions_util import CUSTOM_PORTALS_KEY
-from apps_validation.exceptions import ValidationErrors
-from apps_validation.schema.variable import Variable
 
 from .utils import validate_key_value_types
 

apps_validation/validation/validate_recommended_apps.py

@@ -3,8 +3,8 @@
 
 from jsonschema import validate as json_schema_validate, ValidationError as JsonValidationError
 
-from catalog_reader.names import RECOMMENDED_APPS_FILENAME
 from apps_validation.exceptions import ValidationErrors
+from catalog_reader.names import RECOMMENDED_APPS_FILENAME
 
 from .json_schema_utils import RECOMMENDED_APPS_JSON_SCHEMA
 

catalog_reader/supported_version.py

@@ -1,4 +1,4 @@
-from apps_validation.schema.features import FEATURES
+from apps_schema.features import FEATURES
 
 
 def version_supported(version_details: dict) -> bool:

setup.py

@@ -8,7 +8,14 @@
     description='Validate TrueNAS Apps Catalog',
     version=VERSION,
     include_package_data=True,
-    packages=find_packages(include=['apps_validation', 'catalog_reader', 'apps_validation.*', 'catalog_reader.*']),
+    packages=find_packages(include=[
+        'apps_schema',
+        'apps_schema.*',
+        'apps_validation',
+        'apps_validation.*',
+        'catalog_reader',
+        'catalog_reader.*'
+    ]),
     license='GNU3',
     platforms='any',
     entry_points={