From 20f971741e75caaa13ad29935bacfcd280bb7cd2 Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Wed, 11 Sep 2024 14:54:48 -0500 Subject: [PATCH 1/2] Run pre-commit on all files, not just python (#1880) ## By Submitting this PR I confirm: - I am familiar with the [Contributing Guidelines](https://github.com/nv-morpheus/Morpheus/blob/main/docs/source/developer_guide/contributing.md). - When the PR is ready for review, new or existing tests cover these changes. - When the PR is ready for review, the documentation is up to date with these changes. Authors: - Christopher Harris (https://github.com/cwharris) Approvers: - Anuradha Karuppiah (https://github.com/AnuradhaKaruppiah) - Michael Demoret (https://github.com/mdemoret-nv) URL: https://github.com/nv-morpheus/Morpheus/pull/1880 --- .pre-commit-config.yaml | 5 +---- pyproject.toml | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 890c82a115..54cdf40dcd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,8 +23,7 @@ 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: @@ -32,13 +31,11 @@ repos: 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 diff --git a/pyproject.toml b/pyproject.toml index c597d71c03..c5b01a7d3f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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", From 381097e0a75839022c9c958bdd5bb848fe0aa157 Mon Sep 17 00:00:00 2001 From: David Gardner <96306125+dagardner-nv@users.noreply.github.com> Date: Wed, 11 Sep 2024 14:05:38 -0700 Subject: [PATCH 2/2] Remove `TODO` statements from documentation (#1879) * Remove `TODO` statements from documentation * Add the word `TODO` to the `reject.txt` file, although due to errata-ai/vale#893 this does not guarantee occurrences will always be flagged. Closes #1877 ## By Submitting this PR I confirm: - I am familiar with the [Contributing Guidelines](https://github.com/nv-morpheus/Morpheus/blob/main/docs/source/developer_guide/contributing.md). - When the PR is ready for review, new or existing tests cover these changes. - When the PR is ready for review, the documentation is up to date with these changes. Authors: - David Gardner (https://github.com/dagardner-nv) Approvers: - Michael Demoret (https://github.com/mdemoret-nv) URL: https://github.com/nv-morpheus/Morpheus/pull/1879 --- ci/vale/styles/config/vocabularies/morpheus/reject.txt | 1 + docs/source/developer_guide/architecture.md | 2 +- examples/digital_fingerprinting/demo/review_results.md | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/vale/styles/config/vocabularies/morpheus/reject.txt b/ci/vale/styles/config/vocabularies/morpheus/reject.txt index 07e5703ce1..d16f8aef98 100644 --- a/ci/vale/styles/config/vocabularies/morpheus/reject.txt +++ b/ci/vale/styles/config/vocabularies/morpheus/reject.txt @@ -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 diff --git a/docs/source/developer_guide/architecture.md b/docs/source/developer_guide/architecture.md index 6070304b4f..25bbb96a1c 100644 --- a/docs/source/developer_guide/architecture.md +++ b/docs/source/developer_guide/architecture.md @@ -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. diff --git a/examples/digital_fingerprinting/demo/review_results.md b/examples/digital_fingerprinting/demo/review_results.md index 5e1ee85f40..df2d4f51cc 100644 --- a/examples/digital_fingerprinting/demo/review_results.md +++ b/examples/digital_fingerprinting/demo/review_results.md @@ -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)