Skip to content

Commit

Permalink
Merge branch 'branch-24.10' of github.com:nv-morpheus/Morpheus into f…
Browse files Browse the repository at this point in the history
…inalize-remove-multi-message
  • Loading branch information
yczhang-nv committed Sep 11, 2024
2 parents 03e5605 + 381097e commit f445d21
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 6 deletions.
5 changes: 1 addition & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,19 @@ repos:
rev: 5.12.0
hooks:
- id: isort
args: ["--settings-file=./pyproject.toml"]
files: ^python/
args: ["--filter-files", "--settings-file=./pyproject.toml"]
- repo: https://github.com/PyCQA/flake8
rev: 6.1.0
hooks:
- id: flake8
entry: pflake8
additional_dependencies: [pyproject-flake8]
args: ["--config=./pyproject.toml"]
files: ^python/
- repo: https://github.com/google/yapf
rev: v0.40.2
hooks:
- id: yapf
args: ["--style", "./pyproject.toml"]
files: ^python/

default_language_version:
python: python3
1 change: 1 addition & 0 deletions ci/vale/styles/config/vocabularies/morpheus/reject.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# List of regular expressions matching words we want to reject. Even though we don't have any words listed this
# file needs to exitst in order for vale to pick up our accept.txt file
# Regular expressions are parsed according to the Go syntax: https://golang.org/pkg/regexp/syntax/
(?i)TODO
2 changes: 1 addition & 1 deletion docs/source/developer_guide/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ The organization of Morpheus can be broken down into four different layers. Work
* Composed of one or more nodes, connected by edges.
* All nodes are guaranteed to operate on the same machine, in the same process space.
* Module Layer
* TODO: Add details about modules.
* Similar to stages, modules can builds and connect multiple nodes.
* Node Layer
* Smallest building block in Morpheus.
* Each node operates on the same thread.
Expand Down
1 change: 0 additions & 1 deletion examples/digital_fingerprinting/demo/review_results.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@ limitations under the License.

# Review Inference Results GUI

TODO: Need to decide on how to send the selected/flagged logs for retraining using submit control message feature.

![DFP Review Inference Results](./images/dfp_review_inf_results.png)
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -731,6 +731,7 @@ default_section = "THIRDPARTY"
sections= ["FUTURE", "STDLIB", "THIRDPARTY", "DASK", "RAPIDS", "FIRSTPARTY", "LOCALFOLDER"]
skip= [
"__init__.py",
"__init__.pyi",
# Skip _version.py as it is auto-generated
"_version.py",
".eggs",
Expand Down

0 comments on commit f445d21

Please sign in to comment.