Skip to content

Commit 3705d71

Browse files
baralinebaraline
committed
Merge remote-tracking branch 'origin/main' into ag/similaritysearchupdate
2 parents 71eb541 + 6228c09 commit 3705d71

File tree

269 files changed

+51319
-3395
lines changed

Some content is hidden

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

269 files changed

+51319
-3395
lines changed

‎.all-contributorsrc

+13-1
Original file line numberDiff line numberDiff line change
@@ -2348,7 +2348,10 @@
23482348
"bug",
23492349
"code",
23502350
"doc",
2351-
"research"
2351+
"research",
2352+
"tests",
2353+
"review",
2354+
"data"
23522355
]
23532356
},
23542357
{
@@ -2423,6 +2426,15 @@
24232426
"contributions": [
24242427
"doc"
24252428
]
2429+
},
2430+
{
2431+
"login": "futuer-szd",
2432+
"name": "Futuer",
2433+
"avatar_url": "https://avatars.githubusercontent.com/u/57895730?v=4",
2434+
"profile": "https://github.com/futuer-szd",
2435+
"contributions": [
2436+
"doc"
2437+
]
24262438
}
24272439
],
24282440
"commitType": "docs"

‎.github/workflows/github_maintenance.yml

-35
This file was deleted.

‎.github/workflows/issue_comment_edited.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Issue Comment Posted
2+
3+
on:
4+
issue_comment:
5+
types: [edited]
6+
7+
jobs:
8+
check-pr-labels:
9+
runs-on: ubuntu-20.04
10+
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v4
14+
with:
15+
sparse-checkout: build_tools
16+
17+
- name: Setup Python 3.10
18+
uses: actions/setup-python@v5
19+
with:
20+
python-version: "3.10"
21+
22+
- name: Install PyGithub
23+
run: pip install -Uq PyGithub
24+
25+
- name: Create app token
26+
uses: actions/create-github-app-token@v1
27+
id: app-token
28+
with:
29+
app-id: ${{ vars.PR_APP_ID }}
30+
private-key: ${{ secrets.PR_APP_KEY }}
31+
32+
- name: Assign issue
33+
run: python build_tools/comment_pr_labeler.py
34+
env:
35+
CONTEXT_GITHUB: ${{ toJson(github) }}
36+
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}

‎.github/workflows/issue_comment_posted.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-20.04
1010

1111
steps:
12-
- name: Checkout main
12+
- name: Checkout
1313
uses: actions/checkout@v4
1414
with:
1515
sparse-checkout: build_tools

‎.github/workflows/periodic_github_maintenace.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
with:
2828
repo-token: ${{ steps.app-token.outputs.token }}
2929
days-before-stale: 140
30-
days-before-delete: 9999 # todo take down to 175
30+
days-before-delete: 175
3131
comment-updates: true
3232
tag-committer: true
3333
stale-branch-label: "stale branch"
34-
compare-branches: 'info'
34+
compare-branches: "info"
3535
pr-check: true

‎.github/workflows/periodic_tests.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-20.04
1616

1717
steps:
18-
- name: Checkout main
18+
- name: Checkout
1919
uses: actions/checkout@v4
2020

2121
- name: Setup Python 3.10
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-20.04
3333

3434
steps:
35-
- name: Checkout main
35+
- name: Checkout
3636
uses: actions/checkout@v4
3737

3838
- name: Setup Python 3.10
@@ -49,7 +49,7 @@ jobs:
4949
runs-on: ubuntu-20.04
5050

5151
steps:
52-
- name: Checkout main
52+
- name: Checkout
5353
uses: actions/checkout@v4
5454

5555
- name: Setup Python 3.10
@@ -87,7 +87,7 @@ jobs:
8787
runs-on: ubuntu-20.04
8888

8989
steps:
90-
- name: Checkout main
90+
- name: Checkout
9191
uses: actions/checkout@v4
9292

9393
- name: Setup Python 3.10
@@ -133,7 +133,7 @@ jobs:
133133
python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
134134

135135
steps:
136-
- name: Checkout main
136+
- name: Checkout
137137
uses: actions/checkout@v4
138138

139139
- name: Setup Python
@@ -173,7 +173,7 @@ jobs:
173173
runs-on: ubuntu-20.04
174174

175175
steps:
176-
- name: Checkout main
176+
- name: Checkout
177177
uses: actions/checkout@v4
178178

179179
- name: Setup Python 3.10

‎.github/workflows/pr_examples.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ jobs:
2222
runs-on: ubuntu-20.04
2323

2424
steps:
25-
- name: Checkout main
25+
- name: Checkout
2626
uses: actions/checkout@v4
2727

2828
- name: Setup Python 3.10
2929
uses: actions/setup-python@v5
3030
with:
3131
python-version: "3.10"
3232

33-
- name: Use numba cache to set env variables but not restore cache
33+
- name: Restore numba cache
3434
uses: ./.github/actions/numba_cache
3535
with:
3636
cache_name: "run-notebook-examples"

‎.github/workflows/pr_opened.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-20.04
1616

1717
steps:
18-
- name: Checkout main
18+
- name: Checkout
1919
uses: actions/checkout@v4
2020
with:
2121
sparse-checkout: build_tools

‎.github/workflows/pr_precommit.yml

+18-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
- main
7-
pull_request:
7+
pull_request_target:
88
branches:
99
- main
1010

@@ -17,16 +17,26 @@ jobs:
1717
runs-on: ubuntu-20.04
1818

1919
steps:
20-
- name: Checkout main
20+
- name: Create app token
21+
uses: actions/create-github-app-token@v1
22+
id: app-token
23+
with:
24+
app-id: ${{ vars.PR_APP_ID }}
25+
private-key: ${{ secrets.PR_APP_KEY }}
26+
27+
- name: Checkout
2128
uses: actions/checkout@v4
29+
with:
30+
ref: ${{ github.head_ref }}
31+
token: ${{ steps.app-token.outputs.token }}
2232

2333
- name: Setup Python 3.10
2434
uses: actions/setup-python@v5
2535
with:
2636
python-version: "3.10"
2737

2838
- name: Get changed files
29-
uses: tj-actions/changed-files@v44.5.2
39+
uses: tj-actions/changed-files@v44
3040
id: changed-files
3141

3242
- name: List changed files
@@ -43,6 +53,9 @@ jobs:
4353
with:
4454
extra_args: --files ${{ steps.changed-files.outputs.all_changed_files }}
4555

46-
- if: ${{ failure() && github.event_name == 'pull_request' && github.event.pull_request.draft == false }}
56+
- if: ${{ failure() && github.event_name == 'pull_request' && github.event.pull_request.draft == false && !contains(github.event.pull_request.labels.*.name, 'stop pre-commit fixes')}}
4757
name: Push pre-commit fixes
48-
uses: pre-commit-ci/lite-action@v1.0.2
58+
uses: stefanzweifel/git-auto-commit-action@v5
59+
with:
60+
commit_message: Automatic `pre-commit` fixes
61+
commit_user_name: aeon-actions-bot[bot]

‎.github/workflows/pr_pytest.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ jobs:
2121
runs-on: ubuntu-20.04
2222

2323
steps:
24-
- name: Checkout main
24+
- name: Checkout
2525
uses: actions/checkout@v4
2626

2727
- name: Setup Python 3.10
2828
uses: actions/setup-python@v5
2929
with:
3030
python-version: "3.10"
3131

32-
- name: Use numba cache to set env variables and restore cache
32+
- name: Restore numba cache
3333
uses: ./.github/actions/numba_cache
3434
with:
3535
cache_name: "test-no-soft-deps"
@@ -67,15 +67,15 @@ jobs:
6767
python-version: "3.11"
6868

6969
steps:
70-
- name: Checkout main
70+
- name: Checkout
7171
uses: actions/checkout@v4
7272

7373
- name: Setup Python
7474
uses: actions/setup-python@v5
7575
with:
7676
python-version: ${{ matrix.python-version }}
7777

78-
- name: Use numba cache to set env variables and restore cache
78+
- name: Restore numba cache
7979
uses: ./.github/actions/numba_cache
8080
with:
8181
cache_name: "pytest"
@@ -103,7 +103,7 @@ jobs:
103103
runs-on: ubuntu-20.04
104104

105105
steps:
106-
- name: Checkout main
106+
- name: Checkout
107107
uses: actions/checkout@v4
108108

109109
- name: Setup Python 3.10

‎.github/workflows/precommit_autoupdate.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ jobs:
1717
with:
1818
python-version: "3.10"
1919

20-
- uses: browniebroke/pre-commit-autoupdate-action@v1.0.0
20+
- uses: browniebroke/pre-commit-autoupdate-action@v1
2121

2222
- if: always()
23+
name: Create app token
2324
uses: actions/create-github-app-token@v1
2425
id: app-token
2526
with:

‎.pre-commit-config.yaml

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

3131
- repo: https://github.com/astral-sh/ruff-pre-commit
32-
rev: v0.4.7
32+
rev: v0.4.8
3333
hooks:
3434
- id: ruff
3535
args: [ "--fix"]
3636

3737
- repo: https://github.com/asottile/pyupgrade
38-
rev: v3.15.2
38+
rev: v3.16.0
3939
hooks:
4040
- id: pyupgrade
4141
args: [ "--py38-plus" ]

0 commit comments

Comments
 (0)