Skip to content

Commit d425358

Browse files
Merge branch 'main' into internal/replace_ospath_to_pathlib
2 parents 29ac0e8 + c7d2b2e commit d425358

5 files changed

Lines changed: 47 additions & 35 deletions

File tree

CHANGELOG.md

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55

66
### 1.0.4-dev
77

8+
* `trlc bazel dep`: update to trlc==2.0.5
89

10+
* Fixed wrong links in [README](README.md).
911

1012
### 1.0.3
1113

@@ -55,7 +57,7 @@
5557
* Included Python 3.13 in the CI test matrix.
5658

5759
### 1.0.2
58-
60+
5961
* `lobster-trlc`:
6062
- Added system tests for `lobster-trlc` tool qualification.
6163

@@ -65,7 +67,7 @@ Fixed Bazel execution of system tests.
6567

6668
### 1.0.0
6769

68-
This release has got many system tests, which may help to
70+
This release has got many system tests, which may help to
6971
qualify tools according to use cases in the context of
7072
ISO 26262.
7173
Please refer to [QUALIFICATION.md](QUALIFICATION.md) for more details.
@@ -244,7 +246,7 @@ Add Bazel targets
244246
245247
* `lobster-codebeamer`
246248
- The retry logic uses exponential backoff feature instead of retrying successively
247-
without any time gap. The exponential backoff factor is set to 1 so the
249+
without any time gap. The exponential backoff factor is set to 1 so the
248250
interval of calls will be 1s, 2s, 4s, 8s and so on.
249251
250252
* `lobster-cpp`:
@@ -412,7 +414,7 @@ Add Bazel targets
412414
### 0.12.2
413415
414416
* `lobster-online-report`
415-
- Fix for git hash generation for submodules when the tool is executed from
417+
- Fix for git hash generation for submodules when the tool is executed from
416418
outside a git repository where the submodule is specified as a relative path.
417419
418420
* `lobster-cpptest`
@@ -435,27 +437,27 @@ Add Bazel targets
435437
### 0.12.1
436438
437439
* `lobster-html-report`
438-
- Fix for timestamp generation of git hashes for git submodules.
439-
440+
- Fix for timestamp generation of git hashes for git submodules.
441+
440442
* `lobster-codebeamer`
441443
- Added configurable retry logic for HTTPS requests. Introduced support for two new YAML configuration parameters:
442444
- `retry_error_codes`: A list of HTTP status codes (e.g., `[429, 503, 504]`) that should trigger a retry.
443445
- `num_request_retry`: An integer specifying the maximum number of retry attempts if a request fails with a status code from `retry_error_codes`.
444446
- Fix for `.netrc`-based authentication handling in the `lobster-codebeamer` tool when
445447
fetching the machine name (domain name).
446448
447-
* `lobster-cpptest`
449+
* `lobster-cpptest`
448450
- The tool now writes orphan tests into all output files.
449451
- It now displays a test-name instead of a fixture-name
450452
in the lobster-report and lobster-html-report.
451453
452454
* `lobster-online-report`
453-
- Fix for git hash generation when the tool is executed from
455+
- Fix for git hash generation when the tool is executed from
454456
outside a git repository where the .git folder is not available.
455457
- Reformulate the summary message so that it becomes clear whether the input file has been modified, or whether a new output file has been created.
456458
457-
* `lobster-cpp`
458-
- The uses the relative file path of a c++ file to generate
459+
* `lobster-cpp`
460+
- The uses the relative file path of a c++ file to generate
459461
the unique identifier of a function in that file. This way files with identical
460462
names (but in different folders) are supported, and they can even have
461463
C++ functions with identical names without running into a
@@ -468,10 +470,10 @@ Add Bazel targets
468470
### 0.12.0
469471
470472
* `lobster-trlc` and `lobster-json`
471-
- All command-line arguments except `--config` and `--out` are
473+
- All command-line arguments except `--config` and `--out` are
472474
moved to Yaml based config file. `--config` and `--out` command-line arguments are still supported.
473475
474-
* `lobster-python`
476+
* `lobster-python`
475477
- Add a note to [lobster-python](packages/lobster-tool-python/README.md)
476478
that it can be used for [Bazel](https://bazel.build/) files, too.
477479
- When running `lobster-python --activity` the tool assumes that Python methods with the following name pattern are tests:
@@ -487,7 +489,7 @@ Add Bazel targets
487489
488490
* `lobster-codebeamer`
489491
- Change the behavior of `lobster-codebeamer` such that an output file is always created, even if the codebeamer server has returned zero items.
490-
- The tool used to append `/cb` to the `root` parameter in config file
492+
- The tool used to append `/cb` to the `root` parameter in config file
491493
and now the user explicitly needs to add it while specifying the `root`.
492494
493495
* `lobster-trlc`
@@ -496,39 +498,39 @@ Add Bazel targets
496498
[Detecting duplicated components](https://github.com/bmw-software-engineering/trlc/pull/121),
497499
including an essential improvement in the
498500
[Language Reference Manual](https://bmw-software-engineering.github.io/trlc/lrm.html).
499-
501+
500502
Without the TRLC bug fix `lobster-trlc` will not detect all traces if TRLC authors exploit the bug.
501-
503+
502504
Imagine the following TRLC snippet:
503505
```
504506
Requirement Windscreen_Wiper {
505507
derived_from = [Safety_Critical_Requirement]
506508
derived_from = [Boring_Requirement]
507509
}
508510
```
509-
Here the trace from `Windscreen_Wiper` to `Safety_Critical_Requirement` will not
511+
Here the trace from `Windscreen_Wiper` to `Safety_Critical_Requirement` will not
510512
be detected by `lobster-trlc` if the version of `trlc` is less than 2.0.1.
511513
512514
* `lobster-online-report`
513-
- The `--commit` command line argument in the tool is now
514-
removed and no longer available. It was redundant and is already replaced by the
515-
automated git hash feature that doesn't require user intervention and is handled
515+
- The `--commit` command line argument in the tool is now
516+
removed and no longer available. It was redundant and is already replaced by the
517+
automated git hash feature that doesn't require user intervention and is handled
516518
by the code. See changelog `0.10.0` for more information.
517519
518520
* `lobster-cpptest`
519521
- Removed limitation from `lobster-cpptest` which skipped output files that had less than two LOBSTER items.
520522
521-
* `lobster-json`
523+
* `lobster-json`
522524
- Minor fix of handling multithreading.
523525
- Introduced YAML-based configuration for `lobster-json`, replacing individual command-line arguments.
524526
- Added a `--config` argument to specify a YAML configuration file.
525527
- Eliminated the command-line arguments `--single`, `--inputs`, and `--inputs-from-file`,
526-
unifying user interaction across all lobster tools. Values can now be specified
528+
unifying user interaction across all lobster tools. Values can now be specified
527529
using the YAML configuration file.
528530
- The argument `--out` is still supported as command line argument, and takes precedence over any value given in the YAML configuration file.
529531
530532
* `lobster-html-report`
531-
- The title and placeholder for search box is renamed to `Filter` in
533+
- The title and placeholder for search box is renamed to `Filter` in
532534
tool.
533535
- The tool gives consistent error message if the input file does not exist, even if the user specified no value. In that case the tool tries to open the file called `lobster.report` in the current working directory as input, and it gives the same error message if that file does not exist.
534536
@@ -544,14 +546,14 @@ Add Bazel targets
544546
545547
* `lobster-online-report` now contains the actual git commit hashes when the user executes the tool.
546548
547-
* The configuration management for the following tools has been migrated from
549+
* The configuration management for the following tools has been migrated from
548550
command-line arguments to YAML configuration files.
549551
* `lobster-cpptest`
550552
* `lobster-codebeamer`
551553
552554
### 0.9.21
553555
554-
* `lobster-codebeamer` now supports query string along with query ID, query string (cbQL) can be passed
556+
* `lobster-codebeamer` now supports query string along with query ID, query string (cbQL) can be passed
555557
as a command line argument to `--import-query` for the tool `lobster-codebeamer`.
556558
557559
* `lobster-html-report` has the following updates.
@@ -622,15 +624,15 @@ Add Bazel targets
622624
from C++ unit tests using various regex patterns.
623625
The references must be provided in a format similar to Doxygen comments.
624626
625-
* The `lobster-codebeamer` tool now uses an authentication token.
627+
* The `lobster-codebeamer` tool now uses an authentication token.
626628
Token can be added either in the config file or as an argument.
627629
628630
* The `lobster-python` tool adds the counter logic to the function
629631
identifier. This improves the situations where different functions have
630632
the same name. Line numbers are no longer used in the identifier.
631633
632634
* The `lobster-codebeamer` tool now supports `refs` as an upstream reference
633-
635+
634636
* The `lobster-online-report` tool now works with config files located in
635637
main- and submodules of a repository. This feature needs `git 1.7.8` or higher.
636638
@@ -659,7 +661,7 @@ Add Bazel targets
659661
* The `lobster-html-report` tool now supports argument `--dot` to specify
660662
the path to the graphviz dot utility instead of expecting it in PATH
661663
662-
* The `lobster-online-report` tool now supports argument `--out` to specify
664+
* The `lobster-online-report` tool now supports argument `--out` to specify
663665
the output file instead of editing the input report
664666
665667
* Adds `with kind` and `with prefix` functionality in lobster.conf files
@@ -820,4 +822,4 @@ Add Bazel targets
820822
* bmw-lobster-tool-codebeamer (Codebeamer requirements import)
821823
* bmw-lobster (metapackage to install all the above)
822824
823-
* The TRLC and JSON tools are not quite ready for PyPI release
825+
* The TRLC and JSON tools are not quite ready for PyPI release

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ bazel_dep(name = "gazelle", version = "0.44.0", repo_name = "bazel_gazelle")
5959

6060
git_override(
6161
module_name = "trlc",
62-
commit = "6a5f4dc0a57a95807b9d9ceb763e862a7d439634",
62+
commit = "ce67598d742c6819d404d852615b336eccecada0",
6363
remote = "https://github.com/bmw-software-engineering/trlc.git",
6464
)
6565

README.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,16 @@ Alternatively, use `pipx`:
3939
$ pipx install bmw-lobster --include-deps
4040
```
4141

42-
For the HTML Report `graphviz` is also used to generate the tracing policy diagram. More on that in the user [manual](https://github.com/bmw-software-engineering/lobster/blob/main/documentation/user-manual.md).
42+
For the HTML Report `graphviz` is also used to generate the tracing policy diagram.
43+
More on tracing policies can be found in the user manual on
44+
[configuration files](documentation/config_files.md).
4345

4446
```
4547
$ sudo apt-get install -y graphviz
4648
```
4749

48-
The `lobster-cpp` converter tool needs a specific version of `clang-tidy`. Please see [here](https://github.com/bmw-software-engineering/lobster/blob/main/documentation/user-manual.md#clang-tidy-file-generation) to create it.
50+
The `lobster-cpp` converter tool needs a specific version of `clang-tidy`.
51+
Please see [here](documentation/user-manual.md#clang-tidy-file-generation) to create it.
4952

5053
## Supported inputs
5154

@@ -76,6 +79,7 @@ The following verification and miscellaneous frameworks are supported:
7679

7780
## Documentation
7881

82+
* [User Manual](documentation/user-manual.md)
7983
* Writing [configuration files](documentation/config_files.md) for LOBSTER.
8084
* It is easy to expand the languages and activities supported by
8185
LOBSTER by adding new tracing tools, as long as they create data in
@@ -140,7 +144,8 @@ You can consider lobster as a set of
140144
3. the report creation tool and
141145
4. a renderer for the tracing report.
142146

143-
For a more detailed description please read our [user guide](https://github.com/bmw-software-engineering/lobster/blob/main/documentation/config_files.md).
147+
For a more detailed description please read our user manual on
148+
[configuration files](documentation/config_files.md).
144149

145150
These steps are in the following diagram and go from left to right side:
146151

@@ -217,3 +222,8 @@ The following inputs are planned but not implemented yet:
217222
The copyright holder of LOBSTER is the Bayerische Motoren Werke
218223
Aktiengesellschaft (BMW AG), and LOBSTER is published under the [GNU
219224
Affero General Public License, Version 3](LICENSE.md).
225+
226+
## Acknowledgements
227+
228+
Special thanks to [Florian Schanda](https://github.com/florianschanda)
229+
for his many valuable contributions to this repository.

documentation/user-manual.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# LOBSTER User's Guide
1+
# LOBSTER User Manual
22

33
## Introduction and overview
44

requirements_lock.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -792,8 +792,8 @@ trio-websocket==0.12.2 \
792792
--hash=sha256:22c72c436f3d1e264d0910a3951934798dcc5b00ae56fc4ee079d46c7cf20fae \
793793
--hash=sha256:df605665f1db533f4a386c94525870851096a223adcb97f72a07e8b4beba45b6
794794
# via selenium
795-
trlc==2.0.3 \
796-
--hash=sha256:86b4c8690239f7b993259b316b8d6079633e32dff8f8ddbae5ad61503ac9362d
795+
trlc==2.0.5 \
796+
--hash=sha256:fc4e4e3a21980711e85426d840f4f7f2e6ebb29ce94d55004f7d8e5e4532426c
797797
# via -r requirements.txt
798798
typing-extensions==4.15.0 \
799799
--hash=sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466 \

0 commit comments

Comments
 (0)