Bump ruff to 0.7, normalize conda recipes, clean docs to only use mak…

…efile commands

Add ruff isort to rules
apply isort
update settings

Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>

Makefile

@@ -38,7 +38,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
 
@@ -57,7 +56,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

@@ -16,13 +16,13 @@ dependencies:
  - graphviz
  - gtest
  - httpx>=0.20,<1
- - isort>=5,<6
  - libarrow=16
  - libboost>=1.80.0
  - libboost-headers>=1.80.0
  - libprotobuf<5
  - librdkafka
  - lz4-c
+ - make
  - mamba
  - mdformat>=0.7.17,<0.8
  - ninja
@@ -45,7 +45,7 @@ dependencies:
  - rapidjson
  - requests
  - ruamel.yaml
- - ruff>=0.3,<0.4
+ - ruff>=0.7,<0.8
  - scikit-build
  - setuptools>=69,<74
  - sqlalchemy

conda/dev-environment-win.yml

@@ -3,6 +3,7 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
+#  - bison  # not available on windows
  - brotli
  - bump2version>=1
  - cmake
@@ -11,10 +12,10 @@ dependencies:
  - 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
@@ -44,12 +45,15 @@ dependencies:
  - rapidjson
  - requests
  - ruamel.yaml
- - ruff>=0.3,<0.4
+ - ruff>=0.7,<0.8
  - 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

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

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/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 os.path
 import sys
 import types
@@ -14,8 +14,8 @@
 csp_mod = importlib.util.module_from_spec(spec)
 sys.modules["csp"] = csp_mod
 
-from csp.impl.struct import Struct  # noqa: E402
 from csp.impl.enum import Enum  # noqa: E402
+from csp.impl.struct import Struct  # noqa: E402
 
 
 def struct_type(type_info):

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/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

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/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

csp/impl/types/pydantic_type_resolver.py

@@ -1,6 +1,7 @@
+from typing import Any, Dict, List, Set, Tuple, Type, Union, get_args
+
 import numpy
 from pydantic import TypeAdapter, ValidationError
-from typing import Any, Dict, List, Set, Tuple, Type, Union, get_args
 
 import csp.typing
 from csp.impl.types.container_type_normalizer import ContainerTypeNormalizer

csp/impl/types/pydantic_types.py

@@ -2,10 +2,11 @@
 import sys
 import types
 import typing
+from typing import Any, ForwardRef, Generic, Optional, Type, TypeVar, Union, get_args, get_origin
+
 import typing_extensions
 from pydantic import GetCoreSchemaHandler, ValidationInfo, ValidatorFunctionWrapHandler
 from pydantic_core import CoreSchema, core_schema
-from typing import Any, ForwardRef, Generic, Optional, Type, TypeVar, Union, get_args, get_origin
 
 from csp.impl.types.common_definitions import OutputBasket, OutputBasketContainer
 from csp.impl.types.tstype import SnapKeyType, SnapType, isTsDynamicBasket

csp/impl/types/typing_utils.py

@@ -1,9 +1,10 @@
 # utils for dealing with typing types
-import numpy
 import sys
 import types
 import typing
 
+import numpy
+
 import csp.typing
 
 T = typing.TypeVar("T")

csp/impl/wiring/adapters.py

@@ -1,6 +1,7 @@
 import inspect
 from datetime import timedelta
 from typing import List
+
 from typing_extensions import override
 
 from csp.impl.__cspimpl import _cspimpl

csp/impl/wiring/numba_utils/datetime_extension.py

@@ -7,6 +7,7 @@
 """
 
 import datetime
+
 import numba
 
 from csp.impl.wiring.numba_utils.csp_cpp_numba_interface import C as csp_c

csp/impl/wiring/numba_utils/numba_type_resolver.py

@@ -1,7 +1,8 @@
 import datetime
-import numba
 import typing
 
+import numba
+
 from csp.impl.types.typing_utils import CspTypingUtils
 from csp.impl.wiring.numba_utils import datetime_extension
 

csp/impl/wiring/runtime.py

@@ -1,9 +1,10 @@
-import pytz
 import threading
 import time
 from collections import deque
 from datetime import datetime, timedelta
 
+import pytz
+
 from csp.impl.__cspimpl import _cspimpl
 from csp.impl.error_handling import ExceptionContext
 from csp.impl.wiring.adapters import _graph_return_adapter

csp/math.py

@@ -1,8 +1,9 @@
 import math
-import numpy as np
 from functools import lru_cache
 from typing import List, TypeVar, get_origin
 
+import numpy as np
+
 import csp
 from csp.impl.types.tstype import ts
 from csp.impl.wiring import node

csp/profiler.py

@@ -1,6 +1,5 @@
 import base64
 import gc
-import numpy as np
 import pickle
 import sys
 import threading
@@ -11,6 +10,8 @@
 from io import BytesIO
 from typing import Dict, List
 
+import numpy as np
+
 import csp
 from csp.impl.genericpushadapter import GenericPushAdapter
 from csp.impl.struct import Struct

csp/random.py

@@ -1,7 +1,8 @@
-import numpy as np
 from datetime import timedelta
 from typing import TypeVar
 
+import numpy as np
+
 import csp
 from csp import ts
 from csp.stats import numpy_to_list

csp/stats.py

@@ -1,7 +1,8 @@
-import numpy as np
 from datetime import datetime, timedelta
 from typing import Any, List, Optional, TypeVar, Union
 
+import numpy as np
+
 import csp
 from csp import ts
 from csp.lib import _cspnpstatsimpl, _cspstatsimpl
@@ -232,7 +233,7 @@ def _setup(x, interval, min_window, trigger, sampler, reset, weights=None, ignor
     if min_window is None:
         min_window = interval
     else:
-        if type(min_window) != type(interval):
+        if type(min_window) is not type(interval):
             raise TypeError("Interval and min_window must be of the same type")
 
     if sampler is None: