Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #2714

Merged
merged 34 commits into from
Dec 10, 2024
Merged

Develop #2714

merged 34 commits into from
Dec 10, 2024

Conversation

phlptp
Copy link
Member

@phlptp phlptp commented Dec 7, 2024

Summary

If merged this pull request will merge develop to main for 3.6 release

Proposed changes

dependabot bot and others added 30 commits September 9, 2024 04:57
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6 to 7.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](peter-evans/create-pull-request@v6...v7)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
…develop/peter-evans/create-pull-request-7

Bump peter-evans/create-pull-request from 6 to 7
* ---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* replace jsoncpp with nlohmann::json

* fix some additional test failures

* add a hex conversion function to the json processing

* fix dashes on descriptions for helics broker

* move to more standard location for nlohman/json

* Apply suggestions from code review

Co-authored-by: Ryan Mast <[email protected]>

* Apply suggestions from code review

Co-authored-by: Ryan Mast <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Ryan Mast <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Update toml version in use

* update asio

* update spdlog, fmtlib, and units

* Fix build with fmt-11
# Conflicts:
#	src/helics/application_api/helicsTypes.cpp

* fix some warnings

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* update clang tidy fixes


---------

Co-authored-by: مهدي شينون (Mehdi Chinoune) <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/psf/black: 24.4.2 → 24.8.0](psf/black@24.4.2...24.8.0)
- [github.com/asottile/blacken-docs: 1.16.0 → 1.18.0](adamchainz/blacken-docs@1.16.0...1.18.0)
- [github.com/codespell-project/codespell: v2.2.6 → v2.3.0](codespell-project/codespell@v2.2.6...v2.3.0)
- [github.com/pre-commit/mirrors-clang-format: v18.1.5 → v19.1.0](pre-commit/mirrors-clang-format@v18.1.5...v19.1.0)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates:
- [github.com/psf/black: 24.8.0 → 24.10.0](psf/black@24.8.0...24.10.0)
- [github.com/pre-commit/pre-commit-hooks: v4.6.0 → v5.0.0](pre-commit/pre-commit-hooks@v4.6.0...v5.0.0)
- [github.com/pre-commit/mirrors-clang-format: v19.1.0 → v19.1.1](pre-commit/mirrors-clang-format@v19.1.0...v19.1.1)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
### Merge Commit Summary

- **Update Build Requirements**
  - Minimum CMake version: 3.30
  - Minimum Boost version: 1.86

- **Submodule Management**
  - Added Google Test and Google Benchmarks as submodules.
  - Updated submodule management code.

- **CI/CD Improvements**
  - Updated pipelines and AppVeyor image.
  - Attempted to resolve Boost issues in CI builds.
  - Adjusted Cygwin setup in AppVeyor configuration.

- **Code Quality Enhancements**
  - Applied clang-tidy and fixed various warnings.
  - Cleaned up code and updated tests.
  - Reworked `addBoost` functionality.

- **Pre-commit Hooks**
  - Applied auto-fixes from pre-commit.com hooks throughout the commit history.

- **Code Review Suggestions**
  - Incorporated suggestions from code review.

### Co-authors
- Ryan Mast <[email protected]>
- pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
#2676)

### Git Log Summary

- **Added Tests**
  - Implemented tests with filter config files.
  - Ensured that cloning filters default to clone as the operation.

- **Clang-Tidy Fixes**
  - Fixed various clang-tidy warnings and issues.
  - Applied clang-tidy checks and made necessary fixes.

- **Pre-commit Auto Fixes**
  - Applied auto-fixes from pre-commit.com hooks multiple times.
  - For more information, see [pre-commit.ci](https://pre-commit.ci).

- **Code Review Suggestions**
  - Incorporated suggestions from code review.

### Co-authors
Co-authored-by: Ryan Mast [email protected]
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates:
- [github.com/asottile/blacken-docs: 1.18.0 → 1.19.0](adamchainz/blacken-docs@1.18.0...1.19.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* update the sanitizer tests to newer build environments

* remove octave references

* test for C++20 directly

* try different builders

* tweak some tests

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix a double free in brokerApp

* clang-tidy fixes

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This pull request introduces several changes to the codebase:

* **Octave Removal:**
    * Removes the Octave dependency and related code. 
    * Updates documentation to reflect the removal.
* **Code Formatting and Linting:**
    * Integrates pre-commit hooks to automatically fix formatting and style issues.
    * Updates cpplint checks.
* **Variable Renaming:**
    * Renames all instances of `fi` to `fedInfo`.
* **Dependency Updates:**
    * Updates the networking library.
* **Code Review:**
    * Addresses comments from code review and implements suggestions.

**Additional Notes:**

* Several commits are related to resolving `icwyu` issues (include-what-you-use), likely for improving code clarity and reducing unused dependencies. 
* A cmake cleanup is included as part of the changes.

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ryan Mast <[email protected]>
updates:
- [github.com/pre-commit/mirrors-clang-format: v19.1.1 → v19.1.2](pre-commit/mirrors-clang-format@v19.1.1...v19.1.2)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates:
- [github.com/asottile/blacken-docs: 1.19.0 → 1.19.1](adamchainz/blacken-docs@1.19.0...1.19.1)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
### Summary of Commit Merge

This merge introduces several updates and improvements to the C interface of the HELICS library, focusing on the integration of HELICS Apps and enhancements to testing and code quality. Key changes include:

- **HELICS Apps C Interface**: Added a new C interface for HELICS Apps, expanding the library's functionality.
- **Library Updates**: Incorporated functions related to HELICS Apps into the library.
- **Testing Enhancements**: 
  - Added tests for the new C library functionalities.
  - Introduced additional tests for the C interface, including `helicsEndpointSendString` variants.
  - Tweaked and fixed existing tests to ensure robustness.
- **Code Quality Improvements**:
  - Applied `clang-tidy` fixes to improve code quality and maintainability.
  - Updated `clang-tidy` configurations and backup files.
- **Pre-commit Hooks**: 
  - Automated code formatting and style fixes were applied using pre-commit hooks from [pre-commit.ci](https://pre-commit.ci).
- **File Management**: Added a missing file to the shared C++ library installation.
- **Code Review Adjustments**: Incorporated suggestions from a code review by Ryan Mast.

#### Contributors

- **pre-commit-ci[bot]**: Automated code formatting and style fixes.
- **Ryan Mast**: Provided code review and suggestions.

For more details on automated fixes, see [pre-commit.ci](https://pre-commit.ci).
* add mechanics for retrieving filter properties.

* more clang-tidy

* add C interface for Filter properties

* change response for nullptr in createFromConfig methods

* update backup files

* clang-tidy fixes for filters

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* convert to using threads from std::async

* update tests

* add broker name spec

* Apply suggestions from code review

Co-authored-by: Ryan Mast <[email protected]>

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ryan Mast <[email protected]>
updates:
- [github.com/pre-commit/mirrors-clang-format: v19.1.2 → v19.1.3](pre-commit/mirrors-clang-format@v19.1.2...v19.1.3)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Philip Top <[email protected]>
updates:
- [github.com/pre-commit/mirrors-clang-format: v19.1.3 → v19.1.4](pre-commit/mirrors-clang-format@v19.1.3...v19.1.4)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* start work on adding the ability to pass a file/json string into the broker or core for configuration

* add file test

* Test file pass through for globals and connections

* make some includes system includes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Apply suggestions from code review

Co-authored-by: Ryan Mast <[email protected]>

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ryan Mast <[email protected]>
* Fix a bug in the potential interfaces activation

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* warning fixes and test with cmake 3.31

* update toml version

* update pipelines and installation docs

* fix some warnings on 32 bit build and try parallel flag for visual studio builds on azure

* clang-tidy fixes

* Apply suggestions from code review

Co-authored-by: Ryan Mast <[email protected]>

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ryan Mast <[email protected]>
* Fix a bug in the potential interfaces activation

* create a mechanism for globally synchronized disconnect

* add tests

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Add new `global` description for interfaces

* Add citation to HELICS paper

* Update link to Trevor's bio

* Add documentation on connector fed and translators

* ---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Add pulblications to "References" section of docs

* Update conf.py to load add-ons correctly

On Oct 7 2024, these changes will be needed to build the docs correctly.

https://about.readthedocs.com/blog/2024/07/addons-by-default/

https://docs.readthedocs.io/en/stable/addons.html#enabling-read-the-docs-addons

* Add documenation on async time request example

* Small clean-up in docs

* Correct JSON excerpt on endpoints

* Clarify the configuration of a clone filter

* Update Config Options Reference to correct clone filter

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update conf.py with new docs baseURL

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update docs/references/publications.md to remove duplicate citation

Co-authored-by: Ryan Mast <[email protected]>

* Update docs/user-guide/advanced_topics/connector_fed.md

Co-authored-by: Ryan Mast <[email protected]>

* Update docs/user-guide/examples/advanced_examples/advanced_async_time_request.md

Co-authored-by: Ryan Mast <[email protected]>

* Update docs/user-guide/examples/advanced_examples/advanced_async_time_request.md

Co-authored-by: Ryan Mast <[email protected]>

* Update docs/user-guide/examples/advanced_examples/advanced_async_time_request.md

Co-authored-by: Ryan Mast <[email protected]>

* Update docs/references/configuration_options_reference.md

Co-authored-by: Ryan Mast <[email protected]>

* Fix minor bug in conf.py

* Add documentation on helics_connector

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Clean up to-do for helics_connector docs

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Philip Top <[email protected]>
Co-authored-by: Ryan Mast <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Fix pre-commit errors in the documentation

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
nightlark and others added 3 commits December 6, 2024 04:41
* Remove use of Boost for a scope exit guard in the MPI core

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* try to fix the message size issue in actionMessage without breaking everything

* fix message size for zmq issue

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* clang-tidy and test fixes

* Apply suggestions from code review

Co-authored-by: Ryan Mast <[email protected]>

* clean up message sizes

* update actionmessage code

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ryan Mast <[email protected]>
* make some updates for 3.6 release

* Update Tools_using_HELICS.md

More info on PSS/e and added SAInt

* Fix build with fmt-11

* update references

* Update documents and fix some warnings

* clang-tidy fixes

* fix string replace issues

* fix string replace issues

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update docs/references/configuration_options_reference.md

Co-authored-by: Ryan Mast <[email protected]>

* more clang-tidy

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Apply suggestions from code review

Co-authored-by: Ryan Mast <[email protected]>

* update webserver, clang tidy fixes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* more clang-tidy fixes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* more cleanup on webserver

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: Bryan Palmintier <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: مهدي شينون (Mehdi Chinoune) <[email protected]>
Co-authored-by: Ryan Mast <[email protected]>
@phlptp phlptp requested a review from nightlark December 7, 2024 20:46
@phlptp phlptp merged commit ec953d0 into main Dec 10, 2024
24 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants