From 2421a426dfb0dd49e700e50947a892097945b94a Mon Sep 17 00:00:00 2001 From: Ananya2003Gupta Date: Sat, 2 Sep 2023 01:41:08 +0530 Subject: [PATCH] Sorted includes and parametric types, added StaticArrays package include in CI --- .github/workflows/sanitizers.yaml | 3 +++ .github/workflows/test.yml | 3 +++ .github/workflows/ubuntu.yml | 3 +++ python/podio/generator_utils.py | 2 +- python/podio_class_generator.py | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sanitizers.yaml b/.github/workflows/sanitizers.yaml index f730c287e..6a06fa8c0 100644 --- a/.github/workflows/sanitizers.yaml +++ b/.github/workflows/sanitizers.yaml @@ -51,3 +51,6 @@ jobs: echo "::group::Run tests" ctest --output-on-failure echo "::endgroup::" + + - name: Install StaticArrays Julia Package + run: julia -e 'import Pkg; Pkg.add("StaticArrays")' \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3b30009df..8a4d18b42 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,3 +53,6 @@ jobs: echo "::group::Install" ninja install echo "::endgroup::" + + - name: Install StaticArrays Julia Package + run: julia -e 'import Pkg; Pkg.add("StaticArrays")' \ No newline at end of file diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 9814ca7cb..68637cb2e 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -44,3 +44,6 @@ jobs: echo "::group::Install" ninja install echo "::endgroup::" + + - name: Install StaticArrays Julia Package + run: julia -e 'import Pkg; Pkg.add("StaticArrays")' \ No newline at end of file diff --git a/python/podio/generator_utils.py b/python/podio/generator_utils.py index 4409cd2cc..51e12c296 100644 --- a/python/podio/generator_utils.py +++ b/python/podio/generator_utils.py @@ -187,7 +187,7 @@ def __init__(self, name, **kwargs): self.julia_type = get_julia_type(cpp_type=self.bare_type, is_array=self.is_array, array_type=self.array_type, array_size=self.array_size) - + @property def docstring(self): """Docstring to be used in code generation""" diff --git a/python/podio_class_generator.py b/python/podio_class_generator.py index dab2cc297..f4287d88c 100755 --- a/python/podio_class_generator.py +++ b/python/podio_class_generator.py @@ -291,7 +291,7 @@ def _preprocess_for_julia(self, datatype): if not member.is_builtin: includes_jl_struct.add(self._build_julia_include(member)) datatype['includes_jl']['struct'].update((includes_jl_struct)) - sorted(datatype['includes_jl']['struct']) + datatype['includes_jl']['struct'] = sorted(datatype['includes_jl']['struct']) @staticmethod def _get_julia_params(datatype):