From d9ac41d5d2843a5ad5b5562f5a1daa6f22c431d5 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Tue, 7 May 2024 18:36:59 -0400 Subject: [PATCH 1/2] Pin linters to narrow range to avoid noise Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com> --- conda/dev-environment-unix.yml | 6 +++--- pyproject.toml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda/dev-environment-unix.yml b/conda/dev-environment-unix.yml index b520d640..490ae203 100644 --- a/conda/dev-environment-unix.yml +++ b/conda/dev-environment-unix.yml @@ -8,7 +8,7 @@ dependencies: - build - bump2version>=1 - cmake - - codespell + - codespell>=2.2.6,<2.3 - compilers - cyrus-sasl - exprtk @@ -23,7 +23,7 @@ dependencies: - libboost-headers - lz4-c - mamba - - mdformat + - mdformat>=0.7.17,<0.8 - ninja - numpy - pillow @@ -43,7 +43,7 @@ dependencies: - rapidjson - requests - ruamel.yaml - - ruff + - ruff>=0.3,<0.4 - scikit-build - slack-sdk - sqlalchemy diff --git a/pyproject.toml b/pyproject.toml index dafa366c..e19191af 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,9 +60,9 @@ develop = [ "twine", "wheel", # lint - "codespell", + "codespell>=2.2.6,<2.3", "isort>=5,<6", - "mdformat", + "mdformat>=0.7.17,<0.8", "ruff>=0.3,<0.4", # test "pytest", From 471e1426bb942fb19c6f5ca4b47887c3624068d0 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Tue, 7 May 2024 18:37:16 -0400 Subject: [PATCH 2/2] Run autofixers with pinned up packages Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com> --- docs/wiki/concepts/Execution-Modes.md | 14 +++++++------- docs/wiki/dev-guides/Build-CSP-from-Source.md | 10 +++++----- setup.py | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/wiki/concepts/Execution-Modes.md b/docs/wiki/concepts/Execution-Modes.md index 46902a82..5d288f8c 100644 --- a/docs/wiki/concepts/Execution-Modes.md +++ b/docs/wiki/concepts/Execution-Modes.md @@ -41,14 +41,14 @@ As always, `csp.now()` should still be used in `csp.node` code, even when runnin When consuming data from input adapters there are three choices on how one can consume the data: -| PushMode | EngineMode | Description | -| :------- | :--------- | :---------- | -| **LAST_VALUE** | Simulation | all ticks from input source with duplicate timestamps (on the same timeseries) will tick once with the last value on a given timestamp | -| | Realtime | all ticks that occurred since previous engine cycle will collapse / conflate to the latest value | +| PushMode | EngineMode | Description | +| :----------------- | :--------- | :---------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| **LAST_VALUE** | Simulation | all ticks from input source with duplicate timestamps (on the same timeseries) will tick once with the last value on a given timestamp | +| | Realtime | all ticks that occurred since previous engine cycle will collapse / conflate to the latest value | | **NON_COLLAPSING** | Simulation | all ticks from input source with duplicate timestamps (on the same timeseries) will tick once per engine cycle. subsequent cycles will execute with the same time | -| | Realtime | all ticks that occurred since previous engine cycle will be ticked across subsequent engine cycles as fast as possible | -| **BURST** | Simulation | all ticks from input source with duplicate timestamps (on the same timeseries) will tick once with a list of all values | -| | Realtime | all ticks that occurred since previous engine cycle will tick once with a list of all the values | +| | Realtime | all ticks that occurred since previous engine cycle will be ticked across subsequent engine cycles as fast as possible | +| **BURST** | Simulation | all ticks from input source with duplicate timestamps (on the same timeseries) will tick once with a list of all values | +| | Realtime | all ticks that occurred since previous engine cycle will tick once with a list of all the values | ## Realtime Group Event Synchronization diff --git a/docs/wiki/dev-guides/Build-CSP-from-Source.md b/docs/wiki/dev-guides/Build-CSP-from-Source.md index 0ccaaf42..fc480fea 100644 --- a/docs/wiki/dev-guides/Build-CSP-from-Source.md +++ b/docs/wiki/dev-guides/Build-CSP-from-Source.md @@ -198,11 +198,11 @@ By default, we pull and build dependencies with [vcpkg](https://vcpkg.io/en/). W CSP has listing and auto formatting. -| Language | Linter | Autoformatter | Description | -| :------- | :----- | :------------ | :---------- | -| C++ | `clang-format` | `clang-format` | Style | -| Python | `ruff` | `ruff` | Style | -| Python | `isort` | `isort` | Imports | +| Language | Linter | Autoformatter | Description | +| :------- | :------------- | :------------- | :---------- | +| C++ | `clang-format` | `clang-format` | Style | +| Python | `ruff` | `ruff` | Style | +| Python | `isort` | `isort` | Imports | **C++ Linting** diff --git a/setup.py b/setup.py index 085e442e..d8ec7577 100644 --- a/setup.py +++ b/setup.py @@ -64,7 +64,7 @@ ) if VCPKG_TRIPLET is not None: - cmake_args.append( f"-DVCPKG_TARGET_TRIPLET={VCPKG_TRIPLET}" ) + cmake_args.append(f"-DVCPKG_TARGET_TRIPLET={VCPKG_TRIPLET}") else: cmake_args.append("-DCSP_USE_VCPKG=OFF")