diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 7ea90b0..97c30d7 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -59,7 +59,7 @@ jobs: - run: mk docs if: | - matrix.python-version == '3.12' + matrix.python-version == '3.13' && matrix.system == 'ubuntu-latest' - run: mk python-test @@ -77,16 +77,16 @@ jobs: env: TWINE_USERNAME: __token__ if: | - matrix.python-version == '3.12' + matrix.python-version == '3.13' && matrix.system == 'ubuntu-latest' && env.TWINE_PASSWORD != '' && github.ref_name == 'master' - run: | mk python-release owner=libre-embedded \ - repo=ifgen version=4.4.5 + repo=ifgen version=4.5.0 if: | - matrix.python-version == '3.12' + matrix.python-version == '3.13' && matrix.system == 'ubuntu-latest' && env.GITHUB_API_TOKEN != '' && github.ref_name == 'master' diff --git a/README.md b/README.md index 63a527f..13c4aaa 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,11 @@ ===================================== generator=datazen version=3.2.3 - hash=bb7c6c6ee9e74f924d3169c09662b491 + hash=ad4ce6e07bb17efc31e796eb165cb185 ===================================== --> -# ifgen ([4.4.5](https://pypi.org/project/ifgen/)) +# ifgen ([4.5.0](https://pypi.org/project/ifgen/)) [![python](https://img.shields.io/pypi/pyversions/ifgen.svg)](https://pypi.org/project/ifgen/) ![Build Status](https://github.com/libre-embedded/ifgen/workflows/Python%20Package/badge.svg) @@ -40,7 +40,7 @@ This package is tested on the following platforms: # Command-line Options ``` -$ ./venv3.12/bin/ig -h +$ ./venv3.13/bin/ig -h usage: ig [-h] [--version] [-v] [-q] [--curses] [--no-uvloop] [-C DIR] {gen,svd,noop} ... @@ -48,19 +48,19 @@ usage: ig [-h] [--version] [-v] [-q] [--curses] [--no-uvloop] [-C DIR] An interface generator for distributed computing. options: - -h, --help show this help message and exit - --version show program's version number and exit - -v, --verbose set to increase logging verbosity - -q, --quiet set to reduce output - --curses whether or not to use curses.wrapper when starting - --no-uvloop whether or not to disable uvloop as event loop driver - -C DIR, --dir DIR execute from a specific directory + -h, --help show this help message and exit + --version show program's version number and exit + -v, --verbose set to increase logging verbosity + -q, --quiet set to reduce output + --curses whether or not to use curses.wrapper when starting + --no-uvloop whether or not to disable uvloop as event loop driver + -C, --dir DIR execute from a specific directory commands: - {gen,svd,noop} set of available commands - gen generate interfaces - svd process CMSIS-SVD files - noop command stub (does nothing) + {gen,svd,noop} set of available commands + gen generate interfaces + svd process CMSIS-SVD files + noop command stub (does nothing) ``` diff --git a/config b/config index 86bb39f..a54b215 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit 86bb39ffacaa547ee920abc25f19772ffaaa5475 +Subproject commit a54b2150d7135a7133dc38a26411778f5aa9c3cd diff --git a/ifgen/__init__.py b/ifgen/__init__.py index 89480d1..a091da3 100644 --- a/ifgen/__init__.py +++ b/ifgen/__init__.py @@ -1,7 +1,7 @@ # ===================================== # generator=datazen # version=3.2.3 -# hash=67eaf4ed029fdce58622eee8dd8cfdf0 +# hash=8042bfab9549cff58935b1dd444a1e8f # ===================================== """ @@ -10,4 +10,4 @@ DESCRIPTION = "An interface generator for distributed computing." PKG_NAME = "ifgen" -VERSION = "4.4.5" +VERSION = "4.5.0" diff --git a/ifgen/plugins/struct_receiver/__init__.py b/ifgen/plugins/struct_receiver/__init__.py index 31f4e0f..948e3c6 100644 --- a/ifgen/plugins/struct_receiver/__init__.py +++ b/ifgen/plugins/struct_receiver/__init__.py @@ -138,10 +138,7 @@ def cpp_struct_receiver(task: GenerateTask) -> None: writer.empty() writer.c_comment("Read identifier and advance buffer.") - writer.write( - "struct_id_t ident = " - "handle_endian(" - ) + writer.write("struct_id_t ident = handle_endian(") with writer.indented(): writer.write( "*reinterpret_cast(data));" diff --git a/ifgen/svd/group/enums.py b/ifgen/svd/group/enums.py index 3374292..a3fb676 100644 --- a/ifgen/svd/group/enums.py +++ b/ifgen/svd/group/enums.py @@ -29,7 +29,8 @@ def get_enum_name(name: str, peripheral: str, raw_mapping: EnumValues) -> str: hashed = hash( ",".join( - name + f"={val['value']}" for name, val in raw_mapping.items() + name + f"={val['value']}" + for name, val in sorted(raw_mapping.items()) ) ) diff --git a/local/variables/package.yaml b/local/variables/package.yaml index 4cf3e3d..0b46c02 100644 --- a/local/variables/package.yaml +++ b/local/variables/package.yaml @@ -1,5 +1,5 @@ --- major: 4 -minor: 4 -patch: 5 +minor: 5 +patch: 0 entry: ig diff --git a/pyproject.toml b/pyproject.toml index 5a5cd77..777f273 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta:__legacy__" [project] name = "ifgen" -version = "4.4.5" +version = "4.5.0" description = "An interface generator for distributed computing." readme = "README.md" requires-python = ">=3.12" diff --git a/tests/data/valid/scenarios/sample/ifgen.yaml b/tests/data/valid/scenarios/sample/ifgen.yaml index 95dae48..cb765ef 100644 --- a/tests/data/valid/scenarios/sample/ifgen.yaml +++ b/tests/data/valid/scenarios/sample/ifgen.yaml @@ -16,7 +16,7 @@ custom: c: 3 file2: *data -clang_format: clang-format-18 +clang_format: clang-format-19 structs: Test1: