Skip to content

Commit

Permalink
Merge pull request Point72#223 from Point72/tkp/lint
Browse files Browse the repository at this point in the history
Pin linters to avoid noise, run auto fixers after latest changes and pinning
  • Loading branch information
timkpaine authored and Carreau committed May 13, 2024
2 parents 78e7aca + 471e142 commit 12cceeb
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions conda/dev-environment-unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
- build
- bump2version>=1
- cmake
- codespell
- codespell>=2.2.6,<2.3
- compilers
- cyrus-sasl
- exprtk
Expand All @@ -23,7 +23,7 @@ dependencies:
- libboost-headers
- lz4-c
- mamba
- mdformat
- mdformat>=0.7.17,<0.8
- ninja
- numpy
- pillow
Expand All @@ -43,7 +43,7 @@ dependencies:
- rapidjson
- requests
- ruamel.yaml
- ruff
- ruff>=0.3,<0.4
- scikit-build
- slack-sdk
- sqlalchemy
Expand Down
14 changes: 7 additions & 7 deletions docs/wiki/concepts/Execution-Modes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions docs/wiki/dev-guides/Build-CSP-from-Source.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down

0 comments on commit 12cceeb

Please sign in to comment.