Skip to content

Commit 4fdc1be

Browse files
TonyBagnallTonyBagnall
committed
Merge branch 'main' into ajb/base
# Conflicts: # aeon/classification/base.py
2 parents 9f09e9b + 007e3b5 commit 4fdc1be

File tree

273 files changed

+14676
-4116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

273 files changed

+14676
-4116
lines changed

‎.all-contributorsrc

+38-1
Original file line numberDiff line numberDiff line change
@@ -2454,7 +2454,8 @@
24542454
"profile": "https://github.com/Cyril-Meyer",
24552455
"contributions": [
24562456
"test",
2457-
"doc"
2457+
"doc",
2458+
"code"
24582459
]
24592460
},
24602461
{
@@ -2492,6 +2493,42 @@
24922493
"contributions": [
24932494
"doc"
24942495
]
2496+
},
2497+
{
2498+
"login": "Sharathchenna",
2499+
"name": "Sharathchenna",
2500+
"avatar_url": "https://avatars.githubusercontent.com/u/50939688?v=4",
2501+
"profile": "https://github.com/Sharathchenna",
2502+
"contributions": [
2503+
"code"
2504+
]
2505+
},
2506+
{
2507+
"login": "neuron283",
2508+
"name": "neuron283",
2509+
"avatar_url": "https://avatars.githubusercontent.com/u/177816976?v=4",
2510+
"profile": "https://github.com/neuron283",
2511+
"contributions": [
2512+
"code"
2513+
]
2514+
},
2515+
{
2516+
"login": "wenig",
2517+
"name": "Phillip Wenig",
2518+
"avatar_url": "https://avatars.githubusercontent.com/u/6967289?v=4",
2519+
"profile": "https://github.com/wenig",
2520+
"contributions": [
2521+
"code"
2522+
]
2523+
},
2524+
{
2525+
"login": "aryanpola",
2526+
"name": "Aryan Pola",
2527+
"avatar_url": "https://avatars.githubusercontent.com/u/98093778?v=4",
2528+
"profile": "https://github.com/aryanpola",
2529+
"contributions": [
2530+
"code"
2531+
]
24952532
}
24962533
],
24972534
"commitType": "docs"

‎.github/workflows/fast_release.yml

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Makes a release without testing. Don't run this unless you have to.
2+
name: Fast release
3+
4+
on:
5+
workflow_dispatch:
6+
7+
jobs:
8+
build-project:
9+
runs-on: ubuntu-22.04
10+
11+
steps:
12+
- uses: actions/checkout@v4
13+
14+
- uses: actions/setup-python@v5
15+
with:
16+
python-version: "3.10"
17+
18+
- name: Build project
19+
run: |
20+
python -m pip install build
21+
python -m build
22+
23+
- name: Store build files
24+
uses: actions/upload-artifact@v4
25+
with:
26+
name: dist
27+
path: dist/*
28+
retention-days: 5
29+
30+
upload-wheels:
31+
runs-on: ubuntu-22.04
32+
33+
steps:
34+
- uses: actions/download-artifact@v4
35+
with:
36+
name: dist
37+
path: dist
38+
39+
- name: Publish package to PyPI
40+
uses: pypa/gh-action-pypi-publish@release/v1
41+
with:
42+
password: ${{ secrets.PYPI_TOKEN }}

‎.github/workflows/issue_comment_edited.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ concurrency:
1111
jobs:
1212
pr-welcome-edited:
1313
if: ${{ github.event.issue.pull_request }}
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
1515

1616
steps:
1717
- name: Create app token

‎.github/workflows/issue_comment_posted.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
self-assign:
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-22.04
1010

1111
steps:
1212
- name: Checkout

‎.github/workflows/periodic_github_maintenace.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212

1313
jobs:
1414
stale_branches:
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-22.04
1616

1717
steps:
1818
- name: Create app token
@@ -23,7 +23,7 @@ jobs:
2323
private-key: ${{ secrets.PR_APP_KEY }}
2424

2525
- name: Stale Branches
26-
uses: crs-k/stale-branches@v6.0.1
26+
uses: crs-k/stale-branches@v6.0.2
2727
with:
2828
repo-token: ${{ steps.app-token.outputs.token }}
2929
days-before-stale: 140

‎.github/workflows/periodic_tests.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ concurrency:
1212

1313
jobs:
1414
check-manifest:
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-22.04
1616

1717
steps:
1818
- name: Checkout
@@ -29,7 +29,7 @@ jobs:
2929
extra_args: check-manifest --hook-stage manual
3030

3131
pre-commit:
32-
runs-on: ubuntu-20.04
32+
runs-on: ubuntu-22.04
3333

3434
steps:
3535
- name: Checkout
@@ -46,7 +46,7 @@ jobs:
4646
extra_args: --all-files
4747

4848
run-notebook-examples:
49-
runs-on: ubuntu-20.04
49+
runs-on: ubuntu-22.04
5050

5151
steps:
5252
- name: Checkout
@@ -84,7 +84,7 @@ jobs:
8484
key: numba-run-notebook-examples-${{ runner.os }}-3.10-${{ env.CURRENT_DATE }}
8585

8686
test-no-soft-deps:
87-
runs-on: ubuntu-20.04
87+
runs-on: ubuntu-22.04
8888

8989
steps:
9090
- name: Checkout
@@ -129,7 +129,7 @@ jobs:
129129
strategy:
130130
fail-fast: false
131131
matrix:
132-
os: [ ubuntu-20.04, macOS-14, windows-2022 ]
132+
os: [ ubuntu-22.04, macOS-14, windows-2022 ]
133133
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
134134

135135
steps:
@@ -170,7 +170,7 @@ jobs:
170170
key: numba-pytest-${{ runner.os }}-${{ matrix.python-version}}-${{ env.CURRENT_DATE }}
171171

172172
codecov:
173-
runs-on: ubuntu-20.04
173+
runs-on: ubuntu-22.04
174174

175175
steps:
176176
- name: Checkout

‎.github/workflows/pr_examples.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ concurrency:
1919

2020
jobs:
2121
run-notebook-examples:
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-22.04
2323

2424
steps:
2525
- name: Checkout

‎.github/workflows/pr_opened.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
jobs:
1313
# based on the scikit-learn 1.3.1 PR labelers
1414
labeler:
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-22.04
1616

1717
steps:
1818
- name: Checkout

‎.github/workflows/pr_precommit.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414

1515
jobs:
1616
pre-commit:
17-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-22.04
1818

1919
steps:
2020
- name: Create app token
@@ -37,7 +37,7 @@ jobs:
3737
python-version: "3.10"
3838

3939
- name: Get changed files
40-
uses: tj-actions/changed-files@v44
40+
uses: tj-actions/changed-files@v45
4141
id: changed-files
4242

4343
- name: List changed files

‎.github/workflows/pr_pytest.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ concurrency:
1818

1919
jobs:
2020
test-no-soft-deps:
21-
runs-on: ubuntu-20.04
21+
runs-on: ubuntu-22.04
2222

2323
steps:
2424
- name: Checkout
@@ -55,7 +55,7 @@ jobs:
5555
strategy:
5656
fail-fast: false
5757
matrix:
58-
os: [ ubuntu-20.04, macOS-14, windows-2022 ]
58+
os: [ ubuntu-22.04, macOS-14, windows-2022 ]
5959
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
6060
# skip python versions unless the PR has the 'full pytest actions' label
6161
pr-testing:
@@ -98,7 +98,7 @@ jobs:
9898
# run the code coverage job if a PR has the 'codecov actions' label
9999
if: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'codecov actions') }}
100100

101-
runs-on: ubuntu-20.04
101+
runs-on: ubuntu-22.04
102102

103103
steps:
104104
- name: Checkout

‎.github/workflows/precommit_autoupdate.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
pre-commit-auto-update:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212

1313
steps:
1414
- uses: actions/checkout@v4

‎.github/workflows/release.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
check-manifest:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212

1313
steps:
1414
- uses: actions/checkout@v4
@@ -23,7 +23,7 @@ jobs:
2323

2424
build-project:
2525
needs: check-manifest
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-22.04
2727

2828
steps:
2929
- uses: actions/checkout@v4
@@ -51,7 +51,7 @@ jobs:
5151
strategy:
5252
fail-fast: false
5353
matrix:
54-
os: [ ubuntu-20.04, macOS-14, windows-2022 ]
54+
os: [ ubuntu-22.04, macOS-14, windows-2022 ]
5555
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
5656

5757
steps:
@@ -93,7 +93,7 @@ jobs:
9393

9494
upload-wheels:
9595
needs: test-wheels
96-
runs-on: ubuntu-20.04
96+
runs-on: ubuntu-22.04
9797

9898
steps:
9999
- uses: actions/download-artifact@v4

‎.github/workflows/scorecard.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions: read-all
1313
jobs:
1414
analysis:
1515
name: Scorecard analysis
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-22.04
1717
permissions:
1818
# Needed to upload the results to code-scanning dashboard.
1919
security-events: write

‎.github/workflows/update_contributors.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
generate-markdown-and-commit:
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313

1414
steps:
1515
- uses: actions/checkout@v4

‎.pre-commit-config.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ repos:
2929
args: [ "--create", "--python-folders", "aeon" ]
3030

3131
- repo: https://github.com/astral-sh/ruff-pre-commit
32-
rev: v0.5.6
32+
rev: v0.5.7
3333
hooks:
3434
- id: ruff
3535
args: [ "--fix"]
@@ -38,7 +38,7 @@ repos:
3838
rev: v3.17.0
3939
hooks:
4040
- id: pyupgrade
41-
args: [ "--py38-plus" ]
41+
args: [ "--py39-plus" ]
4242

4343
- repo: https://github.com/pycqa/isort
4444
rev: 5.13.2
@@ -61,13 +61,13 @@ repos:
6161
language_version: python3
6262

6363
- repo: https://github.com/nbQA-dev/nbQA
64-
rev: 1.8.5
64+
rev: 1.8.7
6565
hooks:
6666
- id: nbqa-isort
6767
additional_dependencies: [ isort==5.13.2 ]
6868
args: [ "--nbqa-dont-skip-bad-cells", "--profile=black", "--multi-line=3" ]
6969
- id: nbqa-black
70-
additional_dependencies: [ black==24.2.0 ]
70+
additional_dependencies: [ black==24.4.2 ]
7171
args: [ "--nbqa-dont-skip-bad-cells" ]
7272
- id: nbqa-flake8
7373
additional_dependencies: [ flake8==7.0.0 ]

‎CODEOWNERS

+6-12
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,9 @@ aeon/clustering/ @chrisholder @TonyBagnall
1515

1616
aeon/distances/ @chrisholder @TonyBagnall
1717

18-
aeon/forecasting/ @aiwalter @guzalbulatova @ltsaprounis
19-
2018
aeon/networks/ @hadifawaz1999
2119

22-
aeon/performance_metrics/forecasting/ @aiwalter
23-
24-
aeon/pipeline/ @aiwalter
20+
aeon/performance_metrics/anomaly_detection/ @codelionx @MatthewMiddlehurst
2521

2622
aeon/regression/ @MatthewMiddlehurst @TonyBagnall @dguijo
2723
aeon/regression/deep_learning @hadifawaz1999 @MatthewMiddlehurst @TonyBagnall @dguijo
@@ -33,18 +29,16 @@ aeon/similarity_search/ @baraline
3329
aeon/transformations/collection/ @MatthewMiddlehurst @TonyBagnall
3430
aeon/transformations/collection/dictionary_based/ @patrickzib @MatthewMiddlehurst
3531
aeon/transformations/collection/dictionary_based/_sax.py @patrickzib @MatthewMiddlehurst @hadifawaz1999
36-
aeon/transformations/collection/shapelet_based/dilated_shapelet_transform.py @baraline
32+
aeon/transformations/collection/shapelet_based/_dilated_shapelet_transform.py @baraline
3733

3834
aeon/transformations/series/ @TonyBagnall
39-
40-
aeon/transformations/ @aiwalter
41-
aeon/transformations/clasp.py @patrickzib
42-
aeon/transformations/scaledlogit.py @ltsaprounis
43-
aeon/transformations/theta.py @GuzalBulatova
35+
aeon/transformations/series/_clasp.py @patrickzib
36+
aeon/transformations/series/_scaled_logit.py @ltsaprounis
37+
aeon/transformations/series/_theta.py @GuzalBulatova
4438

4539
aeon/utils/numba/ @baraline @MatthewMiddlehurst
4640

47-
aeon/visualisation/ @baraline
41+
aeon/visualisation/ @baraline @MatthewMiddlehurst
4842

4943
.github/ @aeon-toolkit/aeon-infrastructure-workgroup
5044
build_tools/ @aeon-toolkit/aeon-infrastructure-workgroup

0 commit comments

Comments
 (0)