From fe4deca48820a81d8b2f7e9e84b3eaad6ad9bd89 Mon Sep 17 00:00:00 2001 From: Nils Braun Date: Sat, 12 Jul 2025 19:41:16 +0200 Subject: [PATCH 1/4] Update github actions --- .github/workflows/benchmark_default_branch.yml | 4 ++-- .github/workflows/deploy.yml | 4 ++-- .github/workflows/stylecheck.yml | 4 ++-- .github/workflows/test.yml | 4 ++-- .github/workflows/test_all.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/benchmark_default_branch.yml b/.github/workflows/benchmark_default_branch.yml index baf80f0a..5a784a55 100644 --- a/.github/workflows/benchmark_default_branch.yml +++ b/.github/workflows/benchmark_default_branch.yml @@ -11,8 +11,8 @@ jobs: name: Run pytest-benchmark runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: "3.10" - name: Install dependencies diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b9990238..9f53e31d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -9,9 +9,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: "3.8" cache: 'pip' # caching pip dependencies diff --git a/.github/workflows/stylecheck.yml b/.github/workflows/stylecheck.yml index 1a56b8f6..0eb9863b 100644 --- a/.github/workflows/stylecheck.yml +++ b/.github/workflows/stylecheck.yml @@ -6,6 +6,6 @@ jobs: pre-commit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-python@5 - uses: pre-commit/action@v2.0.0 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 96718f8a..23e44c76 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,10 +15,10 @@ jobs: matrix: python-version: [3.9, "3.10", 3.11, 3.12] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} cache: 'pip' # caching pip dependencies diff --git a/.github/workflows/test_all.yml b/.github/workflows/test_all.yml index 2eebd9c6..1c1dfd65 100644 --- a/.github/workflows/test_all.yml +++ b/.github/workflows/test_all.yml @@ -10,10 +10,10 @@ jobs: name: Test runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python 3.9 - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: 3.9 cache: 'pip' # caching pip dependencies From 7bf331391c8b4297a42ecac6a3367182c15262ea Mon Sep 17 00:00:00 2001 From: Nils Braun Date: Sat, 12 Jul 2025 21:06:00 +0200 Subject: [PATCH 2/4] Quoting --- .github/workflows/benchmark_default_branch.yml | 2 +- .github/workflows/stylecheck.yml | 2 +- .github/workflows/test.yml | 2 +- .github/workflows/test_all.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/benchmark_default_branch.yml b/.github/workflows/benchmark_default_branch.yml index 5a784a55..52a3934c 100644 --- a/.github/workflows/benchmark_default_branch.yml +++ b/.github/workflows/benchmark_default_branch.yml @@ -18,7 +18,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install ".[testing]" + SETUPTOOLS_SCM_PRETEND_VERSION=0.0.0 pip install ".[testing]" - name: Run benchmark run: | cd tests diff --git a/.github/workflows/stylecheck.yml b/.github/workflows/stylecheck.yml index 0eb9863b..328bf793 100644 --- a/.github/workflows/stylecheck.yml +++ b/.github/workflows/stylecheck.yml @@ -7,5 +7,5 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@5 + - uses: actions/setup-python@v5 - uses: pre-commit/action@v2.0.0 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 23e44c76..019cc10e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,7 @@ jobs: # Do all the installations python -m pip install --upgrade pip wheel setuptools - pip install .[testing] + SETUPTOOLS_SCM_PRETEND_VERSION=0.0.0 pip install ".[testing]" # Print out the pip versions for debugging pip list diff --git a/.github/workflows/test_all.yml b/.github/workflows/test_all.yml index 1c1dfd65..b182cf17 100644 --- a/.github/workflows/test_all.yml +++ b/.github/workflows/test_all.yml @@ -22,7 +22,7 @@ jobs: run: | # Do all the installations python -m pip install --upgrade pip wheel setuptools - pip install .[testing] + SETUPTOOLS_SCM_PRETEND_VERSION=0.0.0 pip install ".[testing]" # Print out the pip versions for debugging pip list From 619159285cc65a40b0963600a717e737d6979d8a Mon Sep 17 00:00:00 2001 From: Nils Braun Date: Sat, 12 Jul 2025 21:07:17 +0200 Subject: [PATCH 3/4] Update pre-commit action --- .github/workflows/stylecheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stylecheck.yml b/.github/workflows/stylecheck.yml index 328bf793..9e777cf8 100644 --- a/.github/workflows/stylecheck.yml +++ b/.github/workflows/stylecheck.yml @@ -8,4 +8,4 @@ jobs: steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 - - uses: pre-commit/action@v2.0.0 + - uses: pre-commit/action@v3.0.1 From 60ee41a39d40580d68849c9eb5a82d73cfdd8e84 Mon Sep 17 00:00:00 2001 From: Nils Braun Date: Sun, 13 Jul 2025 20:31:43 +0200 Subject: [PATCH 4/4] Convert to array --- tsfresh/feature_extraction/feature_calculators.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tsfresh/feature_extraction/feature_calculators.py b/tsfresh/feature_extraction/feature_calculators.py index abe3e07b..b0b467c5 100644 --- a/tsfresh/feature_extraction/feature_calculators.py +++ b/tsfresh/feature_extraction/feature_calculators.py @@ -1431,6 +1431,7 @@ def spkt_welch_density(x, param): """ max_length_per_segment = 256 + x = np.asarray(x) _, pxx = welch(x, nperseg=min(len(x), max_length_per_segment)) coeff = [config["coeff"] for config in param] indices = [f"coeff_{i}" for i in coeff] @@ -1815,6 +1816,7 @@ def fourier_entropy(x, bins): """ max_length_per_segment = 256 + x = np.asarray(x) _, pxx = welch(x, nperseg=min(len(x), max_length_per_segment)) return binned_entropy(pxx / np.max(pxx), bins)