merge main

Signed-off-by: Tim Paine <[email protected]>

Author: timkpaine

CMakeLists.txt

@@ -2,7 +2,7 @@
 # Project Configuration #
 #########################
 cmake_minimum_required(VERSION 3.20.0)
-project(csp VERSION "0.0.9")
+project(csp VERSION "0.0.11")
 set(CMAKE_CXX_STANDARD 20)
 
 ###################################################################################################################################################

Makefile

@@ -35,7 +35,6 @@ install:  ## install library
 .PHONY: lint-py lint-cpp lint lints fix-py fix-cpp fix format check checks
 
 lint-py:
-	python -m isort --check csp/ examples/ setup.py
 	python -m ruff check csp/ examples/ setup.py
 	python -m ruff format --check csp/ examples/ setup.py
 
@@ -54,7 +53,7 @@ lint: lint-py lint-docs ## run lints
 lints: lint
 
 fix-py:
-	python -m isort csp/ examples/ setup.py
+	python -m ruff check --fix csp/ examples/ setup.py
 	python -m ruff format csp/ examples/ setup.py
 
 fix-cpp:

conda/dev-environment-unix.yml

@@ -7,7 +7,7 @@ dependencies:
  - brotli
  - bump-my-version
  - cmake
- - codespell>=2.2.6,<2.3
+ - codespell>=2.4,<2.5
  - compilers
  - cyrus-sasl
  - deprecated
@@ -16,21 +16,22 @@ dependencies:
  - graphviz
  - gtest
  - httpx>=0.20,<1
- - isort>=5,<6
  - libarrow=16
  - libboost>=1.80.0
  - libboost-headers>=1.80.0
  - librdkafka
  - lz4-c
+ - make
  - mamba
- - mdformat=0.7.17
+ - mdformat>=0.7.19,<0.8
+ - mdformat-tables>=1,<1.1
  - ninja
  - numpy<2
  - pandas
  - pillow
  - polars
  - psutil
- - pyarrow>=7,<19
+ - pyarrow>=15,<19
  - pydantic>=2
  - pytest
  - pytest-asyncio
@@ -44,7 +45,7 @@ dependencies:
  - rapidjson
  - requests
  - ruamel.yaml
- - ruff>=0.3,<0.4
+ - ruff>=0.9,<0.10
  - scikit-build
  - setuptools>=69,<74
  - sqlalchemy

conda/dev-environment-win.yml

@@ -3,26 +3,28 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
+#  - bison  # not available on windows
  - brotli
  - bump-my-version
  - cmake
- - codespell>=2.2.6,<2.3
+ - codespell>=2.4,<2.5
  - compilers
  - cyrus-sasl
  - deprecated
  - exprtk
+#  - flex  # not available on windows
  - graphviz
  - gtest
  - httpx>=0.20,<1
- - isort>=5,<6
  - libarrow=16
  - libboost>=1.80.0
  - libboost-headers>=1.80.0
  - librdkafka
  - lz4-c
  - make
  - mamba
- - mdformat=0.7.17
+ - mdformat>=0.7.19,<0.8
+ - mdformat-tables>=1,<1.1
  - ninja
  - numpy<2
  - pandas
@@ -43,13 +45,16 @@ dependencies:
  - rapidjson
  - requests
  - ruamel.yaml
- - ruff>=0.3,<0.4
+ - ruff>=0.9,<0.10
  - scikit-build
  - setuptools>=69,<74
  - sqlalchemy
+#  - tar  # not available on windows
  - threadpoolctl
  - tornado
  - twine
  - typing-extensions
+#  - unzip  # not available on windows
  - wheel
+#  - zip  # not available on windows
  - zlib

cpp/csp/adapters/websocket/CMakeLists.txt

@@ -20,7 +20,7 @@ set(WS_CLIENT_SOURCE_FILES
 )
 
 add_library(csp_websocket_client_adapter STATIC ${WS_CLIENT_SOURCE_FILES})
-set_target_properties(csp_websocket_client_adapter PROPERTIES PUBLIC_HEADER "${WS_CLIENT_SOURCE_FILES}")
+set_target_properties(csp_websocket_client_adapter PROPERTIES PUBLIC_HEADER "${WS_CLIENT_HEADER_FILES}")
 
 find_package(Boost REQUIRED)
 find_package(OpenSSL REQUIRED)

csp/__init__.py

@@ -31,7 +31,7 @@
 
 from . import stats
 
-__version__ = "0.0.9"
+__version__ = "0.0.11"
 
 
 def get_include_path():

csp/adapters/db.py

@@ -8,8 +8,9 @@
 except ImportError:
     from backports import zoneinfo
 
-import pytz
 from importlib.metadata import PackageNotFoundError, version as get_package_version
+
+import pytz
 from packaging import version
 
 from csp import PushMode, ts

csp/adapters/output_adapters/parquet.py

@@ -1,9 +1,10 @@
-import numpy
 import os
 from importlib.metadata import PackageNotFoundError, version as get_package_version
-from packaging import version
 from typing import Callable, Dict, Optional, TypeVar
 
+import numpy
+from packaging import version
+
 import csp
 from csp.impl.struct import Struct
 from csp.impl.types.container_type_normalizer import ContainerTypeNormalizer
@@ -85,13 +86,13 @@ def __init__(
 
         if file_name and os.path.exists(file_name):
             if split_columns_to_files:
-                assert os.path.isdir(
-                    file_name
-                ), f"split_columns_to_files is True, but existing past {file_name} is file, not folder"
+                assert os.path.isdir(file_name), (
+                    f"split_columns_to_files is True, but existing past {file_name} is file, not folder"
+                )
             else:
-                assert os.path.isfile(
-                    file_name
-                ), f"split_columns_to_files is False, but existing past {file_name} is folder, not file"
+                assert os.path.isfile(file_name), (
+                    f"split_columns_to_files is False, but existing past {file_name} is folder, not file"
+                )
 
         self._all_column_names = set()
         self._properties = {

csp/adapters/output_adapters/parquet_utility_nodes.py

@@ -1,6 +1,7 @@
-import numpy
 import typing
 
+import numpy
+
 import csp
 
 T = typing.TypeVar("T")

csp/adapters/parquet.py

@@ -1,11 +1,12 @@
 import datetime
 import io
+from importlib.metadata import PackageNotFoundError, version as get_package_version
+from typing import TypeVar
+
 import numpy
 import pyarrow
 import pyarrow.parquet
-from importlib.metadata import PackageNotFoundError, version as get_package_version
 from packaging import version
-from typing import TypeVar
 
 import csp
 from csp.adapters.output_adapters.parquet import ParquetOutputConfig, ParquetWriter, resolve_array_shape_column_name