Skip to content

Commit

Permalink
Merge branch 'template-fix' of https://github.com/davidvlaminck/OTLMO…
Browse files Browse the repository at this point in the history
…W-Template into template-fix
  • Loading branch information
JasperBerton committed Nov 21, 2023
2 parents bc8d881 + 50d22d1 commit 9d6ed82
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
8 changes: 4 additions & 4 deletions otlmow_template/SubsetTemplateCreator.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ def generate_template_from_subset(self, path_to_subset: Path, path_to_template_f
otl_objects = []

for class_object in list(filter(lambda cl: cl.abstract == 0, collector.classes)):
class_directory = None
if kwargs is not None and 'class_directory' in kwargs:
class_directory = kwargs['class_directory']
instance = dynamic_create_instance_from_uri(class_object.objectUri, directory=class_directory)
model_directory = None
if kwargs is not None and 'model_directory' in kwargs:
model_directory = kwargs['model_directory']
instance = dynamic_create_instance_from_uri(class_object.objectUri, model_directory=model_directory)
if instance is None:
continue
instance._assetId.fill_with_dummy_data()
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ classifiers = [
]
requires-python = ">=3.8"
dependencies = [
'otlmow-converter >= 0.12',
'otlmow-converter >= 0.13',
'otlmow-modelbuilder >= 0.11',
]

Expand Down
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
otlmow-converter >= 0.12
otlmow-converter >= 0.13
otlmow-modelbuilder >= 0.11
attrs>=22.2.0
coverage>=3.7.1
Expand All @@ -8,5 +8,4 @@ pluggy>=1.0.0
pytest>=6.2.5
pytest-cov>=4.0.0
pytest-subtests>=0.8.0
numpy>=1.18
openpyxl~=3.1.2

0 comments on commit 9d6ed82

Please sign in to comment.