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

csp/adapters/perspective.py

@@ -1,8 +1,9 @@
 import threading
 from datetime import timedelta
-from perspective import Table as Table_, View as View_
 from typing import Dict, Optional, Union
 
+from perspective import Table as Table_, View as View_
+
 import csp
 from csp import ts
 from csp.impl.perspective_common import (

csp/baselib.py

@@ -2,13 +2,14 @@
 import contextlib
 import logging
 import math
-import numpy as np
-import pytz
 import queue
 import threading
 from datetime import datetime, timedelta
 from typing import Callable, Dict, List, Optional, TypeVar, Union
 
+import numpy as np
+import pytz
+
 import csp
 from csp.impl.__cspimpl import _cspimpl
 from csp.impl.constants import UNSET

csp/build/csp_autogen.py

@@ -1,7 +1,7 @@
 import argparse
 import importlib
-import importlib.util
 import importlib.machinery
+import importlib.util
 import logging
 import os.path
 import sys
@@ -23,11 +23,11 @@
 
 
 def struct_type(type_info):
-    return f"""csp::autogen::{type_info['pytype'].__name__}::Ptr"""
+    return f"""csp::autogen::{type_info["pytype"].__name__}::Ptr"""
 
 
 def enum_type(type_info):
-    return f"""csp::autogen::{type_info['pytype'].__name__}"""
+    return f"""csp::autogen::{type_info["pytype"].__name__}"""
 
 
 def array_type(type_info):
@@ -186,7 +186,7 @@ class {enum_name} : public csp::CspEnum
 
     enum_ enum_value() const {{ return ( enum_ ) value(); }}
 
-    static constexpr uint32_t num_types() {{ return {len( [ x for x in enum_type ] )}; }}
+    static constexpr uint32_t num_types() {{ return {len([x for x in enum_type])}; }}
 
     static bool static_init();
 

csp/curve.py

@@ -1,9 +1,10 @@
 import copy
-import numpy as np
-import pytz
 from datetime import timedelta
 from typing import Union
 
+import numpy as np
+import pytz
+
 from csp import null_ts
 from csp.impl.__cspimpl import _cspimpl
 from csp.impl.pulladapter import PullInputAdapter

csp/dataframe.py

@@ -1,7 +1,8 @@
 from datetime import date, datetime, timedelta
-from packaging import version
 from typing import Dict, Optional
 
+from packaging import version
+
 import csp.baselib
 from csp.impl.wiring.edge import Edge
 

csp/impl/pandas.py

@@ -1,6 +1,7 @@
-import pandas
 from datetime import timedelta
 
+import pandas
+
 import csp
 from csp import ts
 

csp/impl/pandas_accessor.py

@@ -1,9 +1,10 @@
+from datetime import datetime, timedelta
+from typing import Dict, List, TypeVar, Union
+
 import numpy as np
 import pandas as pd
-from datetime import datetime, timedelta
 from pandas.api.extensions import register_dataframe_accessor, register_series_accessor
 from pandas.core.arrays import ExtensionArray
-from typing import Dict, List, TypeVar, Union
 
 import csp
 from csp import ts
@@ -166,7 +167,7 @@ def __init__(self, pandas_obj):
     @staticmethod
     def _validate(obj):
         if not is_csp_type(obj):
-            raise AttributeError("Cannot use 'csp' accessor on objects of " "dtype '{}'.".format(obj.dtype))
+            raise AttributeError("Cannot use 'csp' accessor on objects of dtype '{}'.".format(obj.dtype))
 
     def _infer_dtype(self, data):
         try:

csp/impl/pandas_ext_type.py

@@ -1,15 +1,16 @@
 import copy
 import functools
-import numpy as np
 import operator
-import pandas as pd
 import re
+from pydoc import locate
+from typing import Any, List, Type, TypeVar, Union, cast
+
+import numpy as np
+import pandas as pd
 from pandas.api.types import is_integer, is_list_like
 from pandas.core.arrays import ExtensionArray, ExtensionScalarOpsMixin, IntervalArray
 from pandas.core.dtypes.dtypes import PandasExtensionDtype, register_extension_dtype
 from pandas.core.indexers import check_array_indexer
-from pydoc import locate
-from typing import Any, List, Type, TypeVar, Union, cast
 
 import csp
 from csp.impl.types.tstype import TsType, isTsType, ts

csp/impl/pandas_perspective.py

@@ -1,8 +1,9 @@
+from datetime import datetime, timedelta
+from typing import Optional
+
 import pandas as pd
 import pytz
-from datetime import datetime, timedelta
 from pandas.compat import set_function_name
-from typing import Optional
 
 import csp
 import csp.impl.pandas_accessor  # To ensure that the csp accessors are registered

csp/impl/perspective_common.py

@@ -1,5 +1,6 @@
-import pytz
 from datetime import date, datetime
+
+import pytz
 from packaging import version
 
 try:
@@ -18,7 +19,7 @@
 
 except ImportError:
     raise ImportError(
-        "perspective must be installed to use this module. " "To install, run 'pip install perspective-python'."
+        "perspective must be installed to use this module. To install, run 'pip install perspective-python'."
     )
 
 

csp/impl/struct.py

@@ -1,7 +1,8 @@
 import io
-import ruamel.yaml
 import typing
 from copy import deepcopy
+
+import ruamel.yaml
 from deprecated import deprecated
 
 import csp

csp/impl/types/container_type_normalizer.py

@@ -1,5 +1,6 @@
-import numpy
 import typing
+
+import numpy
 import typing_extensions
 
 import csp.typing

csp/impl/types/instantiation_type_resolver.py

@@ -1,9 +1,10 @@
 import collections
 import inspect
-import numpy
 import typing
 from abc import ABCMeta, abstractmethod
 
+import numpy
+
 import csp.typing
 from csp.impl.types import tstype
 from csp.impl.types.common_definitions import ArgKind, BasketKind, InputDef, OutputDef