diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4f77da3..b6545fd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,7 +39,7 @@ repos: - id: remove-tabs - id: forbid-tabs - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 37cd56d9d154dfb0648eaee8efc1040512700c47 # frozen: 0.29.4 + rev: cb3c2be894b151dff143b1baf6acbd55f2b7faed # frozen: 0.30.0 hooks: - id: check-readthedocs - id: check-dependabot @@ -47,12 +47,12 @@ repos: - id: check-github-workflows args: [--verbose] - repo: https://github.com/Mateusz-Grzelinski/actionlint-py - rev: a1faddedc7c21fa1a5b9bb42e1c3ddbe94e96aa3 # frozen: v1.7.4.18 + rev: 060504a904804d5314d4db5dd12aa8751717ffc7 # frozen: v1.7.4.20 hooks: - id: actionlint additional_dependencies: [pyflakes, shellcheck-py] - repo: https://github.com/commitizen-tools/commitizen - rev: d3f092d98dc7585ce9cb3295bafb942ca5be1886 # frozen: v3.31.0 + rev: 76efedd776e04c9604a1d54fef389a292cbf7768 # frozen: v4.0.0 hooks: - id: commitizen stages: [commit-msg] @@ -138,7 +138,7 @@ repos: always_run: true args: [audit, --json, --ignore-code=CVE-2019-8341] - repo: https://github.com/astral-sh/ruff-pre-commit - rev: cafecb2f683a620516412e109877570ca7648cbd # frozen: v0.7.4 + rev: 859e42ab7d54544f32d4f73bbc2136a7d9094f54 # frozen: v0.8.1 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] diff --git a/docs/requirements.txt b/docs/requirements.txt index a6e6151..37141c3 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -51,11 +51,11 @@ soupsieve==2.6 ; python_version >= "3.8" and python_version < "3.13" super-collections==0.5.3 ; python_version >= "3.8" and python_version < "3.13" symspellpy==6.7.8 ; python_version >= "3.8" and python_version < "3.13" termcolor==2.4.0 ; python_version >= "3.8" and python_version < "3.13" -tomli==2.1.0 ; python_version >= "3.8" and python_version < "3.13" +tomli==2.2.1 ; python_version >= "3.8" and python_version < "3.13" typeguard==4.4.0 ; python_version >= "3.8" and python_version < "3.13" typing-extensions==4.12.2 ; python_version >= "3.8" and python_version < "3.13" urllib3==2.2.3 ; python_version >= "3.8" and python_version < "3.13" watchdog==4.0.2 ; python_version >= "3.8" and python_version < "3.13" wcmatch==10.0 ; python_version >= "3.8" and python_version < "3.13" -wheel==0.45.0 ; python_version >= "3.8" and python_version < "3.9" +wheel==0.45.1 ; python_version >= "3.8" and python_version < "3.9" zipp==3.20.2 ; python_version >= "3.8" and python_version < "3.10" diff --git a/pyproject.toml b/pyproject.toml index 6f956ab..87dc5fc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -89,7 +89,7 @@ pyright = {extras = ["nodejs"], version = "1.1.389"} pyroma = "^4.2" tox = "^4.0" tox-gh-actions = "^3.1.0" -twine = "^5.0.0" +twine = "^6.0.1" types-python-dateutil = "^2.9" types-pyyaml = "^6.0" types-requests = "^2.31" diff --git a/src/tm_data_types/__init__.py b/src/tm_data_types/__init__.py index c6be35d..b0c4b7f 100644 --- a/src/tm_data_types/__init__.py +++ b/src/tm_data_types/__init__.py @@ -23,20 +23,20 @@ __version__ = version("tm_data_types") __all__ = [ - "Waveform", - "WaveformMetaInfo", "AnalogWaveform", "AnalogWaveformMetaInfo", - "IQWaveform", - "IQWaveformMetaInfo", "DigitalWaveform", "DigitalWaveformMetaInfo", - "RawSample", + "FileExtensions", + "IQWaveform", + "IQWaveformMetaInfo", "Normalized", - "write_file", - "write_files_in_parallel", + "RawSample", + "SIBaseUnit", + "Waveform", + "WaveformMetaInfo", "read_file", "read_files_in_parallel", - "SIBaseUnit", - "FileExtensions", + "write_file", + "write_files_in_parallel", ] diff --git a/src/tm_data_types/datum/data_types.py b/src/tm_data_types/datum/data_types.py index 2df0cfa..be1c95f 100644 --- a/src/tm_data_types/datum/data_types.py +++ b/src/tm_data_types/datum/data_types.py @@ -36,7 +36,7 @@ def _check_type( # convert to the provided type, or it's an ndarray use the previous dtype if isinstance(as_type, np.dtype): dtype = as_type - elif as_type and np.issubdtype(as_type, np.floating) or np.issubdtype(as_type, np.integer): + elif (as_type and np.issubdtype(as_type, np.floating)) or np.issubdtype(as_type, np.integer): dtype = np.dtype(as_type) elif as_type is None and MeasuredData and isinstance(measured_data, np.ndarray): dtype = measured_data.dtype diff --git a/tests/requirements.txt b/tests/requirements.txt index d14ee18..58d6999 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -20,7 +20,7 @@ packaging==24.2 ; python_version >= "3.8" and python_version < "3.13" pathvalidate==3.2.1 ; python_version >= "3.8" and python_version < "3.13" pluggy==1.5.0 ; python_version >= "3.8" and python_version < "3.13" pytablewriter==1.2.0 ; python_version >= "3.8" and python_version < "3.13" -pytest==8.3.3 ; python_version >= "3.8" and python_version < "3.13" +pytest==8.3.4 ; python_version >= "3.8" and python_version < "3.13" pytest-cov==5.0.0 ; python_version >= "3.8" and python_version < "3.13" pytest-depends==1.0.1 ; python_version >= "3.8" and python_version < "3.13" pytest-env==1.1.5 ; python_version >= "3.8" and python_version < "3.13" @@ -36,7 +36,7 @@ six==1.16.0 ; python_version >= "3.8" and python_version < "3.13" soupsieve==2.6 ; python_version >= "3.8" and python_version < "3.13" tabledata==1.3.3 ; python_version >= "3.8" and python_version < "3.13" tcolorpy==0.1.6 ; python_version >= "3.8" and python_version < "3.13" -tomli==2.1.0 ; python_version >= "3.8" and python_full_version <= "3.11.0a6" +tomli==2.2.1 ; python_version >= "3.8" and python_full_version <= "3.11.0a6" typepy==1.3.2 ; python_version >= "3.8" and python_version < "3.13" typepy[datetime]==1.3.2 ; python_version >= "3.8" and python_version < "3.13" urllib3==2.2.3 ; python_version >= "3.8" and python_version < "3.13"