specware 1.2.0__tar.gz → 1.2.2__tar.gz

{specware-1.2.0 → specware-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: specware
-Version: 1.2.0
+Version: 1.2.2
 Summary: Provides utilities to specify software.
 Keywords: certification,documentation,markdown,qualification,requirements-management,traceability
 Author: The specware Authors
@@ -20,7 +20,7 @@ Classifier: Topic :: Software Development :: Quality Assurance
 Classifier: Topic :: Software Development :: Testing :: Acceptance
 Classifier: Topic :: Text Processing :: Markup
 Classifier: Typing :: Typed
-Requires-Dist: specitems>=1.2.0
+Requires-Dist: specitems>=1.4.5
 Requires-Python: >=3.11
 Project-URL: Source Code, https://github.com/specthings/specware
 Project-URL: Bug Tracker, https://github.com/specthings/specware/issues

{specware-1.2.0 → specware-1.2.2}/pyproject.toml

@@ -4,7 +4,7 @@
 
 [project]
 name = "specware"
-version = "1.2.0"
+version = "1.2.2"
 description = "Provides utilities to specify software."
 authors = [
     {name = "The specware Authors", email = "specthings@embedded-brains.de"}
@@ -13,7 +13,7 @@ license = "BSD-2-Clause"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
-    "specitems >=1.2.0",
+    "specitems >=1.4.5",
 ]
 keywords = [
   "certification",
@@ -51,7 +51,7 @@ specwareverify = "specware.cliverify:cliverify"
 specwareview = "specware.cliview:cliview"
 
 [build-system]
-requires = ["uv_build>=0.10.0,<0.11.0"]
+requires = ["uv_build>=0.10.0"]
 build-backend = "uv_build"
 
 [dependency-groups]

{specware-1.2.0 → specware-1.2.2}/src/specware/cliexport.py

@@ -37,7 +37,7 @@ from specitems import (Content, DocumentGlossaryConfig, GlossaryConfig,
                        MarkdownMapper, SpecDocumentConfig, SphinxContent,
                        SphinxMapper, augment_glossary_terms, create_config,
                        generate_glossary, generate_specification_documentation,
-                       item_is_enabled)
+                       item_is_enabled, monitor_logging)
 
 from specware import (MarkdownInterfaceMapper, SpecWareTypeProvider,
                       SphinxInterfaceMapper,
@@ -123,26 +123,30 @@ def _generate_more(item_cache: ItemCache, config: dict,
 def cliexport(argv: list[str] = sys.argv):
     """ Export the specification to source and documentation files. """
     args = _parse_args(argv)
-    config, working_directory = load_specware_config(args.config_file)
-    Content.AUTOMATICALLY_GENERATED_WARNING = config.get(
-        "automatically-generated-warning",
-        Content.AUTOMATICALLY_GENERATED_WARNING)
-    with contextlib.chdir(working_directory):
-        item_cache = ItemCache(create_config(config["spec"], ItemCacheConfig),
-                               type_provider=SpecWareTypeProvider({}),
-                               is_item_enabled=item_is_enabled)
-        for uid in config["glossary"]["project-groups"]:
-            group = item_cache[uid]
-            assert group.type == "glossary/group"
-            augment_glossary_terms(group, [])
+    with monitor_logging() as monitor:
+        config, working_directory = load_specware_config(args.config_file)
+        Content.AUTOMATICALLY_GENERATED_WARNING = config.get(
+            "automatically-generated-warning",
+            Content.AUTOMATICALLY_GENERATED_WARNING)
+        with contextlib.chdir(working_directory):
+            item_cache = ItemCache(create_config(config["spec"],
+                                                 ItemCacheConfig),
+                                   type_provider=SpecWareTypeProvider({}),
+                                   is_item_enabled=item_is_enabled)
+            for uid in config["glossary"]["project-groups"]:
+                group = item_cache[uid]
+                assert group.type == "glossary/group"
+                augment_glossary_terms(group, [])
 
-        if not args.no_code and not args.no_validation_code:
-            config_validation = config["validation"]
-            for mapping in config_validation["base-directory-map"]:
-                for key, value in mapping.items():
-                    mapping[key] = os.path.normpath(
-                        os.path.join(working_directory, value))
-            generate_validation(config_validation, item_cache, args.targets)
+            if not args.no_code and not args.no_validation_code:
+                config_validation = config["validation"]
+                for mapping in config_validation["base-directory-map"]:
+                    for key, value in mapping.items():
+                        mapping[key] = os.path.normpath(
+                            os.path.join(working_directory, value))
+                generate_validation(config_validation, item_cache,
+                                    args.targets)
 
-        if not args.targets:
-            _generate_more(item_cache, config, args)
+            if not args.targets:
+                _generate_more(item_cache, config, args)
+        return monitor.get_status().exit_code()

{specware-1.2.0 → specware-1.2.2}/src/specware/cliverify.py

@@ -3,7 +3,7 @@
 Provides a command line interface to verify the specification item format.
 """
 
-# Copyright (C) 2020, 2025 embedded brains GmbH & Co. KG
+# Copyright (C) 2020, 2026 embedded brains GmbH & Co. KG
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -51,4 +51,4 @@ def cliverify(argv: list[str] = sys.argv):
                              cache_directory="cache-specware")
     type_provider = SpecWareTypeProvider({})
     item_cache = ItemCache(config, type_provider=type_provider)
-    verify_specification_format(item_cache)
+    return verify_specification_format(item_cache).exit_code()

{specware-1.2.0 → specware-1.2.2}/src/specware/validation.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 """ Provides methods to generate C language validation tests. """
 
-# Copyright (C) 2020, 2025 embedded brains GmbH & Co. KG
+# Copyright (C) 2020, 2026 embedded brains GmbH & Co. KG
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -29,6 +29,7 @@
 import itertools
 import functools
 import os
+import logging
 import re
 from typing import Any, Optional
 
@@ -1308,9 +1309,10 @@ class _SourceFile:
         """
         base_directory = self._base_directory
         if base_directory is None:
-            raise ValueError(
-                f"the source file '{self._file}' is not a source file of "
-                "an item of type 'build/test-program'")
+            logging.error(
+                "the source file '%s' is not a source file of "
+                "an item of type 'build/test-program'", self._file)
+            return
         content = CContent()
         includes: list[CInclude] = []
         local_includes: list[CInclude] = []