Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/benchmark_default_branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ 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
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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/stylecheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: pre-commit/action@v2.0.0
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: pre-commit/action@v3.0.1
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions tsfresh/feature_extraction/feature_calculators.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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)

Expand Down
Loading