dsw-tdk 4.21.0__py2.py3-none-any.whl → 4.22.0__py2.py3-none-any.whl

dsw/tdk/validation.py

@@ -98,6 +98,38 @@ def _validate_natural(field_name: str, value) -> List[ValidationError]:
     return []
 
 
+def _validate_metamodel_version(field_name: str, value) -> List[ValidationError]:
+    if isinstance(value, int) and value > 0:
+        return []
+    if isinstance(value, str) and '.' in value:
+        parts = value.split('.')
+        if len(parts) != 2:
+            return [ValidationError(
+                field_name=field_name,
+                message='It must be in format <MAJOR>.<MINOR>',
+            )]
+        try:
+            major = int(parts[0])
+            minor = int(parts[1])
+            if major < 1 or minor < 0:
+                return [ValidationError(
+                    field_name=field_name,
+                    message='It must be in format <MAJOR>.<MINOR> '
+                            'with MAJOR >= 1 and MINOR >= 0',
+                )]
+            return []
+        except ValueError:
+            return [ValidationError(
+                field_name=field_name,
+                message='It must be in format <MAJOR>.<MINOR> '
+                        'with MAJOR >= 1 and MINOR >= 0',
+            )]
+    return [ValidationError(
+        field_name=field_name,
+        message='It must be a positive integer or in format <MAJOR>.<MINOR>',
+    )]
+
+
 def _validate_package_id(field_name: str, value: str) -> List[ValidationError]:
     res = []
     if value is None:
@@ -255,7 +287,7 @@ TemplateValidator = GenericValidator({
     'description': [_validate_required, _validate_non_empty],
     'readme': [_validate_required, _validate_non_empty],
     'license': [_validate_required, _validate_non_empty],
-    'metamodel_version': [_validate_natural],
+    'metamodel_version': [_validate_metamodel_version, _validate_required],
     'allowed_packages': [_validate_package_filters],
     'formats': [_validate_required, _validate_formats],
 })

{dsw_tdk-4.21.0.dist-info → dsw_tdk-4.22.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsw-tdk
-Version: 4.21.0
+Version: 4.22.0
 Summary: Data Stewardship Wizard Template Development Toolkit
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0

dsw_tdk-4.22.0.dist-info/RECORD

@@ -0,0 +1,21 @@
+dsw/tdk/__init__.py,sha256=zJeTybb0SqiNdGLkANjRa36hku4axi17mZL2dM3tHto,288
+dsw/tdk/__main__.py,sha256=cCzxo6f7raF50kQE-nM_segNjCNe723ZrxOBB6f3qwc,84
+dsw/tdk/api_client.py,sha256=04obYHBIVO-HYQn2-tBIMMgtvOGb1_p6dxrM-orGMco,14925
+dsw/tdk/build_info.py,sha256=bDd3GoYgJdJUbXf4stBKs2LPR0wqqskNu7LnHSTG_Kw,381
+dsw/tdk/cli.py,sha256=CLKd8F9O0nKJ5JyDSdKL6xp2tibnImxhwdl8ejCQU7k,28117
+dsw/tdk/config.py,sha256=ZZlpMqJ5QGsiywwleXtFS2DO1bhnp3ttGOsNq4VoPYc,4888
+dsw/tdk/consts.py,sha256=sKAoQ57f7WaTsjDTBWAaEp_JjQLLuhD04GJuUObQ6Vs,713
+dsw/tdk/core.py,sha256=uEsJgHJDI1K_Cwb4OrzNk8b62uPv_3NmgCd2XOU8B8Q,27432
+dsw/tdk/model.py,sha256=e7wAraebj66AMRSKc1Lkmvrsj7m9ep2UcAxMdwd_x0c,17340
+dsw/tdk/utils.py,sha256=ICZpgxkDRWg9lq1gnHyQCEISFMtmGtu8Hl5yEclwn14,5685
+dsw/tdk/validation.py,sha256=PxgthiZJIk7al64n7Nj7Bp5Vvg_ltxRm3ocp74UO8Y8,10173
+dsw/tdk/templates/LICENSE.j2,sha256=6WzK06169rxZ4V_boYgejcZkw-1Up_WoU18iI3Gbkfs,60
+dsw/tdk/templates/README.md.j2,sha256=FzUABeMM8To0oT48Kytoox64uAZ8F7FSAAXgpyKzqdU,247
+dsw/tdk/templates/env.j2,sha256=yUaY7ZLbjdG45-_q6KWi-YnX9bjP7_lfXrowhJF1he0,98
+dsw/tdk/templates/starter.j2,sha256=JKJIkiXsmBO4P6pKXM4IvSz3JgJhqCnaZI1NVfPPnXg,246
+dsw_tdk-4.22.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dsw_tdk-4.22.0.dist-info/METADATA,sha256=oRyaxNx4Zp6RgCweNpZ38miCwdIA4OJCXuvb-9QMR0w,6095
+dsw_tdk-4.22.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+dsw_tdk-4.22.0.dist-info/entry_points.txt,sha256=lwD5ZzRCbTFSjP1-SkhYsaJe8sEXOWWgMAMUhw0v2Hk,41
+dsw_tdk-4.22.0.dist-info/top_level.txt,sha256=7SfbsHFoJ_vlAgG6C-xzETETwYO71dBrGnod8uMFnjw,4
+dsw_tdk-4.22.0.dist-info/RECORD,,

dsw_tdk-4.21.0.dist-info/RECORD

@@ -1,20 +0,0 @@
-dsw/tdk/__init__.py,sha256=zJeTybb0SqiNdGLkANjRa36hku4axi17mZL2dM3tHto,288
-dsw/tdk/__main__.py,sha256=cCzxo6f7raF50kQE-nM_segNjCNe723ZrxOBB6f3qwc,84
-dsw/tdk/api_client.py,sha256=dQGEYflfzTFtEMWKC2mNbdz6-rS8MwlCzyOpCg2oXrU,14966
-dsw/tdk/build_info.py,sha256=2TaoAW1wLyA3L9FL03ku_vnXzJurrxKOfI2Oyf1i2aA,381
-dsw/tdk/cli.py,sha256=uz3nLv8gUZQqKvarc_STMlpgkGylhAprBFRMcJphc2Q,21965
-dsw/tdk/consts.py,sha256=nxV-yRK4D_NjI9ukXBazwpbOEmAmWQZ5V_B2z8tnoHs,604
-dsw/tdk/core.py,sha256=qnYSMaoN2j4Jt16yywfG-Z_SE27eGLzTCvf-SzMdB8A,27329
-dsw/tdk/model.py,sha256=MKTFmfSYc41GZc-XgyVQR8gzWGAfE1afjNQP8eVY7DM,17244
-dsw/tdk/utils.py,sha256=ICZpgxkDRWg9lq1gnHyQCEISFMtmGtu8Hl5yEclwn14,5685
-dsw/tdk/validation.py,sha256=EINgQAk-fAATIjwwpzds1YCzuetVkefGDvYVxTzjV-o,8972
-dsw/tdk/templates/LICENSE.j2,sha256=6WzK06169rxZ4V_boYgejcZkw-1Up_WoU18iI3Gbkfs,60
-dsw/tdk/templates/README.md.j2,sha256=FzUABeMM8To0oT48Kytoox64uAZ8F7FSAAXgpyKzqdU,247
-dsw/tdk/templates/env.j2,sha256=7IJ6HAIY1bXKLake4c72DSEUcQtAquO5wlSgH8vg_8s,97
-dsw/tdk/templates/starter.j2,sha256=JKJIkiXsmBO4P6pKXM4IvSz3JgJhqCnaZI1NVfPPnXg,246
-dsw_tdk-4.21.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dsw_tdk-4.21.0.dist-info/METADATA,sha256=0VzBshwBkDF5Im-9vL5biXeO1Csv3INRKLt3zvy6lIQ,6095
-dsw_tdk-4.21.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-dsw_tdk-4.21.0.dist-info/entry_points.txt,sha256=lwD5ZzRCbTFSjP1-SkhYsaJe8sEXOWWgMAMUhw0v2Hk,41
-dsw_tdk-4.21.0.dist-info/top_level.txt,sha256=7SfbsHFoJ_vlAgG6C-xzETETwYO71dBrGnod8uMFnjw,4
-dsw_tdk-4.21.0.dist-info/RECORD,,