Skip to content

Commit

Permalink
Merge branch 'main' into recall
Browse files Browse the repository at this point in the history
  • Loading branch information
aryanpola authored Dec 20, 2024
2 parents 4db8027 + 39fe7b4 commit 4baaec7
Show file tree
Hide file tree
Showing 226 changed files with 3,107 additions and 1,894 deletions.
18 changes: 18 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -2620,6 +2620,24 @@
"code",
"bug"
]
},
{
"login": "vedpawar2254",
"name": "ved pawar",
"avatar_url": "https://avatars.githubusercontent.com/u/85354558?v=4",
"profile": "https://github.com/vedpawar2254",
"contributions": [
"doc"
]
},
{
"login": "adilsonmedronha",
"name": "Adilson",
"avatar_url": "https://avatars.githubusercontent.com/u/52141524?v=4",
"profile": "https://github.com/adilsonmedronha",
"contributions": [
"doc"
]
}
],
"commitType": "docs"
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ body:
Please run the following code snippet and paste the output here.
```python
from aeon import show_versions; show_versions()
from aeon.utils import show_versions; show_versions()
```
placeholder: |
<details>
Expand Down
19 changes: 10 additions & 9 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<!--
Thanks for contributing a pull request! Please ensure you have taken a look at our
contribution guide: https://www.aeon-toolkit.org/en/stable/contributing.html
contribution guide: https://www.aeon-toolkit.org/en/stable/contributing.html.
Feel free to delete sections of this template if they do not apply to your PR,
avoid submitting a blank template or empty sections.
If you are a new contributor, do not delete this template without a suitable
replacement or reason. If in doubt, ask for help. We're here to help!
-->

#### Reference Issues/PRs
Expand Down Expand Up @@ -32,26 +34,25 @@ to a minimum.
#### Any other comments?

<!--
Please be aware that we are a loose team of volunteers so patience is
necessary; assistance handling other issues is very welcome. We value all
user contributions, no matter how minor they are. If we are slow to
review, either the pull request needs some benchmarking, tinkering,
convincing, etc. or more likely the reviewers are simply busy. In either
case, we ask for your understanding during the review process.
Please be aware that we are a team of volunteers so patience is
necessary when waiting for a review or reply. While we value all contributions big or
small, pull requests which do not follow our guidelines may be closed.
-->

### PR checklist

<!--
Please go through the checklist below. Please feel free to remove points if they are not applicable.
Please go through the checklist below. Please feel free to remove points if they are
not applicable. To check a box, replace the space inside the square brackets with an
'x' i.e. [x].
-->

##### For all contributions
- [ ] I've added myself to the [list of contributors](https://github.com/aeon-toolkit/aeon/blob/main/.all-contributorsrc). Alternatively, you can use the [@all-contributors](https://allcontributors.org/docs/en/bot/usage) bot to do this for you.
- [ ] The PR title starts with either [ENH], [MNT], [DOC], [BUG], [REF], [DEP] or [GOV] indicating whether the PR topic is related to enhancement, maintenance, documentation, bugs, refactoring, deprecation or governance.

##### For new estimators and functions
- [ ] I've added the estimator to the online [API documentation](https://www.aeon-toolkit.org/en/latest/api_reference.html).
- [ ] I've added the estimator/function to the online [API documentation](https://www.aeon-toolkit.org/en/latest/api_reference.html).
- [ ] (OPTIONAL) I've added myself as a `__maintainer__` at the top of relevant files and want to be contacted regarding its maintenance. Unmaintained files may be removed. This is for the full file, and you should not add yourself if you are just making minor changes or do not want to help maintain its contents.

##### For developers with write access
Expand Down
12 changes: 4 additions & 8 deletions .github/utilities/changelog_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def fetch_merged_pull_requests(page: int = 1) -> list[dict]:
"base": "main",
"state": "closed",
"page": page,
"per_page": 50,
"per_page": 100,
"sort": "updated",
"direction": "desc",
}
Expand Down Expand Up @@ -65,13 +65,9 @@ def fetch_pull_requests_since_last_release() -> list[dict]:
all_pulls = []
while not is_exhausted:
pulls = fetch_merged_pull_requests(page=page)
all_pulls.extend(
[p for p in pulls if parser.parse(p["merged_at"]) > published_at]
)
is_exhausted = (
any(parser.parse(p["merged_at"]) < published_at for p in pulls)
or len(pulls) == 0
)
is_exhausted = len(pulls) == 0
pulls = [p for p in pulls if parser.parse(p["merged_at"]) > published_at]
all_pulls.extend(pulls)
page += 1
return all_pulls

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fast_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
build-project:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
Expand All @@ -28,7 +28,7 @@ jobs:
retention-days: 5

upload-wheels:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/download-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issue_assigned.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ concurrency:

jobs:
remove-good-first-issue:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Create app token
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issue_comment_edited.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ concurrency:
jobs:
pr-welcome-edited:
if: ${{ github.event.issue.pull_request }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Create app token
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issue_comment_posted.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
self-assign:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/periodic_github_maintenace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:

jobs:
stale_branches:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Create app token
Expand Down
43 changes: 37 additions & 6 deletions .github/workflows/periodic_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:

jobs:
check-manifest:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Checkout
Expand All @@ -29,7 +29,7 @@ jobs:
extra_args: check-manifest --hook-stage manual

pre-commit:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Checkout
Expand All @@ -46,7 +46,7 @@ jobs:
extra_args: --all-files

run-notebook-examples:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Checkout
Expand Down Expand Up @@ -83,8 +83,33 @@ jobs:
# Save cache with the current date (ENV set in numba_cache action)
key: numba-run-notebook-examples-${{ runner.os }}-3.10-${{ env.CURRENT_DATE }}

test-core-imports:
runs-on: ubuntu-24.04

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Python 3.10
uses: actions/setup-python@v5
with:
python-version: "3.10"

- name: Install aeon and dependencies
uses: nick-fields/retry@v3
with:
timeout_minutes: 30
max_attempts: 3
command: python -m pip install .

- name: Show dependencies
run: python -m pip list

- name: Run import test
run: python aeon/testing/tests/test_core_imports.py

test-no-soft-deps:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Checkout
Expand Down Expand Up @@ -129,7 +154,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-22.04, macOS-14, windows-2022 ]
os: [ ubuntu-24.04, macOS-14, windows-2022 ]
python-version: [ "3.9", "3.10", "3.11", "3.12" ]

steps:
Expand All @@ -141,6 +166,12 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Set swap space
if: runner.os == 'Linux'
uses: pierotofy/[email protected]
with:
swap-size-gb: 10

- name: Use numba cache to set env variables but not restore cache
uses: ./.github/actions/numba_cache
with:
Expand Down Expand Up @@ -170,7 +201,7 @@ jobs:
key: numba-pytest-${{ runner.os }}-${{ matrix.python-version}}-${{ env.CURRENT_DATE }}

codecov:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Checkout
Expand Down
43 changes: 43 additions & 0 deletions .github/workflows/pr_core_dep_import.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: PR module imports

on:
push:
branches:
- main
pull_request:
branches:
- main
paths:
- "aeon/**"
- ".github/workflows/**"
- "pyproject.toml"

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
cancel-in-progress: true

jobs:
test-core-imports:
runs-on: ubuntu-24.04

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Python 3.10
uses: actions/setup-python@v5
with:
python-version: "3.10"

- name: Install aeon and dependencies
uses: nick-fields/retry@v3
with:
timeout_minutes: 30
max_attempts: 3
command: python -m pip install .

- name: Show dependencies
run: python -m pip list

- name: Run import test
run: python aeon/testing/tests/test_core_imports.py
6 changes: 3 additions & 3 deletions .github/workflows/pr_examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:

jobs:
run-notebook-examples:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Checkout
Expand All @@ -30,7 +30,7 @@ jobs:
with:
python-version: "3.10"

- if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no numba cache') }}
- if: ${{ github.event_name != 'pull_request' || !contains(github.event.pull_request.labels.*.name, 'no numba cache') }}
name: Restore numba cache
uses: ./.github/actions/numba_cache
with:
Expand All @@ -46,5 +46,5 @@ jobs:
command: python -m pip install .[all_extras,binder,dev]

- name: Run example notebooks
run: .github/utilities/run_examples.sh ${{ github.event_name != 'pull_request' || !contains(github.event.pull_request.labels.*.name, 'full examples run') }}
run: .github/utilities/run_examples.sh ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'full examples run') }}
shell: bash
2 changes: 1 addition & 1 deletion .github/workflows/pr_opened.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
jobs:
# based on the scikit-learn 1.3.1 PR labelers
labeler:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ concurrency:

jobs:
pre-commit:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Create app token
Expand Down
Loading

0 comments on commit 4baaec7

Please sign in to comment.