Skip to content

Commit 675669d

Browse files
Merge remote-tracking branch 'origin/main' into pm/time_point_ROCKAD_refactor
# Conflicts: # aeon/anomaly_detection/collection/_classification.py # aeon/anomaly_detection/collection/_outlier_detection.py # aeon/anomaly_detection/collection/base.py # aeon/anomaly_detection/series/base.py # aeon/anomaly_detection/series/distance_based/__init__.py # aeon/anomaly_detection/series/outlier_detection/__init__.py # aeon/anomaly_detection/series/outlier_detection/tests/test_one_class_svm.py # aeon/testing/estimator_checking/_yield_collection_anomaly_detection_checks.py # aeon/testing/estimator_checking/_yield_estimator_checks.py # aeon/testing/testing_data.py # aeon/utils/base/_identifier.py # aeon/utils/base/_register.py # aeon/utils/tags/_tags.py # docs/api_reference/anomaly_detection.rst
2 parents 1b036bd + c86d391 commit 675669d

File tree

300 files changed

+14676
-9623
lines changed

Some content is hidden

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

300 files changed

+14676
-9623
lines changed

.all-contributorsrc

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2701,6 +2701,52 @@
27012701
"contributions": [
27022702
"code"
27032703
]
2704+
},
2705+
{
2706+
"login": "SomtoOnyekwelu",
2707+
"name": "Somtochukwu Benedict Onyekwelu",
2708+
"avatar_url": "https://avatars.githubusercontent.com/u/117727947?v=4",
2709+
"profile": "https://github.com/SomtoOnyekwelu",
2710+
"contributions": [
2711+
"doc"
2712+
]
2713+
},
2714+
{
2715+
"login": "TinaJin0228",
2716+
"name": "Tina Jin",
2717+
"avatar_url": "https://avatars.githubusercontent.com/TinaJin0228",
2718+
"profile": "https://github.com/TinaJin0228",
2719+
"contributions": [
2720+
"code",
2721+
"doc"
2722+
]
2723+
},
2724+
{
2725+
"login": "lucifer4073",
2726+
"name": "Balgopal Moharana",
2727+
"avatar_url": "https://avatars.githubusercontent.com/u/99070111?v=4",
2728+
"profile": "https://github.com/lucifer4073",
2729+
"contributions": [
2730+
"code"
2731+
]
2732+
},
2733+
{
2734+
"login": "Ahmed-Zahran02",
2735+
"name": "Ahmed Zahran",
2736+
"avatar_url": "https://avatars.githubusercontent.com/u/136983104?v=4",
2737+
"profile": "https://github.com/Ahmed-Zahran02",
2738+
"contributions": [
2739+
"doc"
2740+
]
2741+
},
2742+
{
2743+
"login": "AnaghDeshpande",
2744+
"name": "Anagh.B.Deshpande",
2745+
"avatar_url": "https://avatars.githubusercontent.com/u/125550290?v=4",
2746+
"profile": "https://github.com/AnaghDeshpande",
2747+
"contributions": [
2748+
"doc"
2749+
]
27042750
}
27052751
],
27062752
"commitType": "docs"

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ contact_links:
33
url: https://github.com/aeon-toolkit/aeon/discussions/new/choose
44
about: If none of these options fit, your question or topic may be better suited to a discussion.
55
- name: "\U0001F4AC Slack"
6-
url: https://join.slack.com/t/aeon-toolkit/shared_invite/zt-22vwvut29-HDpCu~7VBUozyfL_8j3dLA
6+
url: https://join.slack.com/t/aeon-toolkit/shared_invite/zt-36dlmbouu-vajTShUYAHopSXUUVtHGzw
77
about: For all other questions and general chat, come chat with the aeon community on Slack!
88
- name: "\u2709\uFE0F Email"
99
url: https://mailxto.com/jbp3ave49x
1010
about: Send an email to the aeon developers at contact@aeon-toolkit.org. Checked periodically.
1111
- name: "\u2709\uFE0F CoC Report"
12-
url: https://www.aeon-toolkit.org/en/latest/code_of_conduct.html
13-
about: Report an incident to the Code of Conduct Workgroup.
12+
url: https://www.aeon-toolkit.org/en/stable/code_of_conduct.html
13+
about: Report an incident to the Code of Conduct Moderators.

.github/actions/cpu_all_extras/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ inputs:
55
python_version:
66
description: "Python version used"
77
required: false
8-
default: "3.11"
8+
default: "3.12"
99
additional_extras:
1010
description: "Comma-separated list of additional extras to install"
1111
required: false
@@ -15,7 +15,7 @@ runs:
1515
using: "composite"
1616
steps:
1717
- name: Install CPU TensorFlow
18-
if: ${{ runner.os == 'Linux' && inputs.python_version != '3.13' }}
18+
if: ${{ runner.os == 'Linux' && inputs.python_version != '3.13.5' }}
1919
uses: nick-fields/retry@v3
2020
with:
2121
timeout_minutes: 30

.github/utilities/generate_developer_tables.py

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
generate_authors_table.py
1212
"""
1313

14+
import os
1415
import sys
1516
import time
1617
from os import path
@@ -19,7 +20,7 @@
1920
import requests
2021

2122
LOGO_URL = "https://avatars2.githubusercontent.com/u/78909809"
22-
REPO_FOLDER = Path(path.abspath(__file__)).parent.parent
23+
REPO_FOLDER = Path(path.abspath(__file__)).parent.parent.parent
2324

2425

2526
def get(url, auth):
@@ -41,8 +42,8 @@ def get(url, auth):
4142

4243
def get_contributors(auth):
4344
"""Get the list of contributor profiles. Require admin rights."""
44-
cocw = []
45-
cocw_slug = "aeon-code-of-conduct-workgroup"
45+
cocm = []
46+
cocm_slug = "aeon-code-of-conduct-moderators"
4647
cw = []
4748
cw_slug = "aeon-communications-workgroup"
4849
cd = []
@@ -53,51 +54,54 @@ def get_contributors(auth):
5354
iw_slug = "aeon-infrastructure-workgroup"
5455
rmw = []
5556
rmw_slug = "aeon-release-management-workgroup"
57+
sd = []
58+
sd_slug = "aeon-supporting-developers"
5659

5760
entry_point = "https://api.github.com/orgs/aeon-toolkit/"
5861

5962
for team_slug, lst in zip(
60-
(cocw_slug, cw_slug, cd_slug, fw_slug, iw_slug, rmw_slug),
61-
(cocw, cw, cd, fw, iw, rmw),
63+
(cocm_slug, cw_slug, cd_slug, fw_slug, iw_slug, rmw_slug, sd_slug),
64+
(cocm, cw, cd, fw, iw, rmw, sd),
6265
):
6366
for page in range(5): # 5 pages, 30 per page
6467
reply = get(f"{entry_point}teams/{team_slug}/members?page={page}", auth)
6568
lst.extend(reply.json())
6669

6770
# keep only the logins
68-
cocw = {c["login"] for c in cocw}
71+
cocm = {c["login"] for c in cocm}
6972
cw = {c["login"] for c in cw}
7073
cd = {c["login"] for c in cd}
7174
fw = {c["login"] for c in fw}
7275
iw = {c["login"] for c in iw}
7376
rmw = {c["login"] for c in rmw}
74-
75-
# add missing contributors with GitHub accounts
76-
cocw |= {"KatieBuc"}
77+
sd = {c["login"] for c in sd}
7778

7879
# get profiles from GitHub
79-
cocw = [get_profile(login, auth) for login in cocw]
80+
cocm = [get_profile(login, auth) for login in cocm]
8081
cw = [get_profile(login, auth) for login in cw]
8182
cd = [get_profile(login, auth) for login in cd]
8283
fw = [get_profile(login, auth) for login in fw]
8384
iw = [get_profile(login, auth) for login in iw]
8485
rmw = [get_profile(login, auth) for login in rmw]
86+
sd = [get_profile(login, auth) for login in sd]
8587

8688
# sort by last name
87-
cocw = sorted(cocw, key=key)
89+
cocm = sorted(cocm, key=key)
8890
cw = sorted(cw, key=key)
8991
cd = sorted(cd, key=key)
9092
fw = sorted(fw, key=key)
9193
iw = sorted(iw, key=key)
9294
rmw = sorted(rmw, key=key)
95+
sd = sorted(sd, key=key)
9396

9497
return (
95-
cocw,
98+
cocm,
9699
cw,
97100
cd,
98101
fw,
99102
iw,
100103
rmw,
104+
sd,
101105
)
102106

103107

@@ -112,13 +116,6 @@ def get_profile(login, auth):
112116
if profile["name"] is None:
113117
profile["name"] = profile["login"]
114118

115-
# fix missing names
116-
missing_names = {
117-
"KatieBuc": "Katie Buchhorn",
118-
}
119-
if profile["name"] in missing_names:
120-
profile["name"] = missing_names[profile["name"]]
121-
122119
return profile
123120

124121

@@ -150,25 +147,28 @@ def generate_table(contributors):
150147

151148

152149
if __name__ == "__main__":
153-
print("access token:", file=sys.stderr) # noqa: T201
154-
token = input()
155-
auth = ("user", token)
150+
auth = os.getenv("GITHUB_TOKEN")
151+
if auth is None:
152+
print("access token:", file=sys.stderr) # noqa: T201
153+
token = input()
154+
auth = ("user", token)
156155

157156
(
158-
cocw,
157+
cocm,
159158
cw,
160159
cd,
161160
fw,
162161
iw,
163162
rmw,
163+
sd,
164164
) = get_contributors(auth)
165165

166166
with open(
167-
REPO_FOLDER / "docs" / "about" / "code_of_conduct_workgroup.md",
167+
REPO_FOLDER / "docs" / "about" / "code_of_conduct_moderators.md",
168168
"w+",
169169
encoding="utf-8",
170170
) as rst_file:
171-
rst_file.write(generate_table(cocw))
171+
rst_file.write(generate_table(cocm))
172172

173173
with open(
174174
REPO_FOLDER / "docs" / "about" / "communications_workgroup.md",
@@ -200,3 +200,10 @@ def generate_table(contributors):
200200
encoding="utf-8",
201201
) as rst_file:
202202
rst_file.write(generate_table(rmw))
203+
204+
with open(
205+
REPO_FOLDER / "docs" / "about" / "supporting_developers.md",
206+
"w+",
207+
encoding="utf-8",
208+
) as rst_file:
209+
rst_file.write(generate_table(sd))

.github/utilities/pr_open_commenter.py

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,10 @@
3434
if label == cur_label:
3535
content_labels[i] = new_label
3636

37-
labels = [(label.name, label.color) for label in repo.get_labels()]
38-
title_labels = [
39-
f"$\\color{{#{color}}}{{\\textsf{{{label}}}}}$"
40-
for label, color in labels
41-
if label in title_labels
42-
]
43-
title_labels_new = [
44-
f"$\\color{{#{color}}}{{\\textsf{{{label}}}}}$"
45-
for label, color in labels
46-
if label in title_labels_new
47-
]
48-
content_labels = [
49-
f"$\\color{{#{color}}}{{\\textsf{{{label}}}}}$"
50-
for label, color in labels
51-
if label in content_labels
52-
]
37+
labels = [label.name for label in repo.get_labels()]
38+
title_labels = [f"**{label}**" for label in labels if label in title_labels]
39+
title_labels_new = [f"**{label}**" for label in labels if label in title_labels_new]
40+
content_labels = [f"**{label}**" for label in labels if label in content_labels]
5341

5442
title_labels_str = ""
5543
if len(title_labels) == 0:
@@ -62,30 +50,28 @@
6250
arr_str = str(title_labels_new).strip("[]").replace("'", "")
6351
title_labels_str = (
6452
"I have added the following labels to this PR based on the title: "
65-
f"**[ {arr_str} ]**."
53+
f"[ {arr_str} ]."
6654
)
6755
if len(title_labels) != len(title_labels_new):
6856
arr_str = (
6957
str(set(title_labels) - set(title_labels_new)).strip("[]").replace("'", "")
7058
)
71-
title_labels_str += (
72-
f" The following labels were already present: **[ {arr_str} ]**"
73-
)
59+
title_labels_str += f" The following labels were already present: [ {arr_str} ]"
7460

7561
content_labels_str = ""
7662
if len(content_labels) != 0:
7763
if content_labels_status == "used":
7864
arr_str = str(content_labels).strip("[]").replace("'", "")
7965
content_labels_str = (
8066
"I have added the following labels to this PR based on "
81-
f"the changes made: **[ {arr_str} ]**. Feel free "
67+
f"the changes made: [ {arr_str} ]. Feel free "
8268
"to change these if they do not properly represent the PR."
8369
)
8470
elif content_labels_status == "ignored":
8571
arr_str = str(content_labels).strip("[]").replace("'", "")
8672
content_labels_str = (
8773
"I would have added the following labels to this PR "
88-
f"based on the changes made: **[ {arr_str} ]**, "
74+
f"based on the changes made: [ {arr_str} ], "
8975
"however some package labels are already present."
9076
)
9177
elif content_labels_status == "large":
@@ -112,9 +98,10 @@
11298
11399
If our `pre-commit` code quality check fails, any trivial fixes will automatically be pushed to your PR unless it is a draft.
114100
115-
Don't hesitate to ask questions on the `aeon` [Slack](https://join.slack.com/t/aeon-toolkit/shared_invite/zt-22vwvut29-HDpCu~7VBUozyfL_8j3dLA) channel if you have any.
101+
Don't hesitate to ask questions on the `aeon` [Slack](https://join.slack.com/t/aeon-toolkit/shared_invite/zt-36dlmbouu-vajTShUYAHopSXUUVtHGzw) channel if you have any.
116102
117-
### PR CI actions
103+
<details><summary>PR CI actions</summary>
104+
<p>
118105
119106
These checkboxes will add labels to enable/disable CI functionality for this PR. This may not take effect immediately, and a new commit may be required to run the new configuration.
120107
@@ -126,5 +113,8 @@
126113
- [ ] Stop automatic `pre-commit` fixes (always disabled for drafts)
127114
- [ ] Disable numba cache loading
128115
- [ ] Push an empty commit to re-run CI checks
116+
117+
</p>
118+
</details>
129119
""" # noqa
130120
)

.github/workflows/fast_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v4
1313

14-
- name: Setup Python 3.11
14+
- name: Setup Python 3.12
1515
uses: actions/setup-python@v5
1616
with:
17-
python-version: "3.11"
17+
python-version: "3.12"
1818

1919
- name: Build project
2020
run: |

.github/workflows/issue_assigned.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
with:
2626
sparse-checkout: .github/utilities
2727

28-
- name: Setup Python 3.11
28+
- name: Setup Python 3.12
2929
uses: actions/setup-python@v5
3030
with:
31-
python-version: "3.11"
31+
python-version: "3.12"
3232

3333
- name: Install PyGithub
3434
run: pip install -Uq PyGithub

.github/workflows/issue_comment_edited.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
with:
2727
sparse-checkout: .github/utilities
2828

29-
- name: Setup Python 3.11
29+
- name: Setup Python 3.12
3030
uses: actions/setup-python@v5
3131
with:
32-
python-version: "3.11"
32+
python-version: "3.12"
3333

3434
- name: Install PyGithub
3535
run: pip install -Uq PyGithub
@@ -51,10 +51,9 @@ jobs:
5151

5252
- if: ${{ steps.label_out.outputs.empty_commit == 'true' }}
5353
name: Push empty commit
54-
uses: stefanzweifel/git-auto-commit-action@v5
54+
uses: stefanzweifel/git-auto-commit-action@v6
5555
with:
5656
commit_message: Empty commit for CI
5757
commit_user_name: aeon-actions-bot[bot]
5858
commit_options: --allow-empty
59-
create_branch: false
6059
skip_dirty_check: true

.github/workflows/issue_comment_posted.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
with:
1515
sparse-checkout: .github/utilities
1616

17-
- name: Setup Python 3.11
17+
- name: Setup Python 3.12
1818
uses: actions/setup-python@v5
1919
with:
20-
python-version: "3.11"
20+
python-version: "3.12"
2121

2222
- name: Install PyGithub
2323
run: pip install -Uq PyGithub

0 commit comments

Comments
 (0)