Skip to content

Commit

Permalink
Merge branch 'main' into datatype-class-refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
fkiraly committed May 14, 2024
2 parents ce477b9 + e383fed commit 0321f22
Show file tree
Hide file tree
Showing 297 changed files with 10,095 additions and 2,035 deletions.
191 changes: 189 additions & 2 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -2116,7 +2116,8 @@
"profile": "https://www.linkedin.com/in/pranav-prajapati-a5b413226/",
"contributions": [
"code",
"test"
"test",
"bug"
]
},
{
Expand Down Expand Up @@ -2342,7 +2343,9 @@
"profile": "https://github.com/Ram0nB",
"contributions": [
"doc",
"code"
"code",
"bug",
"test"
]
},
{
Expand Down Expand Up @@ -2607,15 +2610,199 @@
"code"
]
},
{
"login": "ShreeshaM07",
"name": "Shreesha M",
"avatar_url": "https://avatars.githubusercontent.com/u/120820143?s=400&v=4",
"profile": "https://github.com/ShreeshaM07",
"contributions": [
"bug",
"code",
"test"
]
},
{
"login": "geetu040",
"name": "Armaghan",
"avatar_url": "https://avatars.githubusercontent.com/u/90601662?s=96&v=4",
"profile": "https://github.com/geetu040",
"contributions": [
"code",
"doc",
"maintenance"
]
},
{
"login": "Xinyu-Wu-0000",
"name": "Xinyu Wu",
"avatar_url": "https://avatars.githubusercontent.com/u/57612792?v=4",
"profile": "https://github.com/Xinyu-Wu-0000",
"contributions": [
"bug",
"code",
"test"
]
},
{
"login": "meraldoantonio",
"name": "Meraldo Antonio",
"avatar_url": "https://avatars.githubusercontent.com/u/37468543?v=4",
"profile": "https://github.com/meraldoantonio",
"contributions": [
"doc"
]
},
{
"login": "memeo-pro",
"name": "Yash Edake",
"avatar_url": "https://avatars.githubusercontent.com/memeo-pro",
"profile": "https://github.com/MEMEO-PRO",
"contributions": [
"maintenance",
"bug"
]
},
{
"login": "deysanjeeb",
"name": "Sanjeeb Dey",
"avatar_url": "https://avatars.githubusercontent.com/u/39940629?v=4",
"profile": "https://github.com/deysanjeeb",
"contributions": [
"maintenance"
]
},
{
"login": "YashKhare20",
"name": "Yash Khare",
"avatar_url": "https://avatars.githubusercontent.com/u/92680366?s=400",
"profile": "https://github.com/YashKhare20",
"contributions": [
"code",
"doc"
]
},
{
"login": "ianspektor",
"name": "Ian Spektor",
"avatar_url": "https://avatars.githubusercontent.com/u/49082859?v=4",
"profile": "https://github.com/ianspektor",
"contributions": [
"code",
"doc"
]
},
{
"login": "javiber",
"name": "Javier Berneche",
"avatar_url": "https://avatars.githubusercontent.com/u/3588715?v=4",
"profile": "https://github.com/javiber",
"contributions": [
"code",
"doc"
]
},
{
"login": "fnhirwa",
"name": "Felix Hirwa Nshuti",
"avatar_url": "https://avatars.githubusercontent.com/u/67042527?s=64&v=4",
"profile": "https://github.com/fnhirwa",
"contributions": [
"code",
"maintenance"
]
},
{
"login": "SamruddhiNavale",
"name": "Samruddhi Navale",
"avatar_url": "https://avatars.githubusercontent.com/u/86359115?v=4",
"profile": "https://github.com/SamruddhiNavale",
"contributions": [
"doc"
]
},
{
"login": "vandit98",
"name": "Vandit Tyagi",
"avatar_url": "https://avatars.githubusercontent.com/u/91458535?v=4",
"profile": "https://github.com/vandit98",
"contributions": [
"doc"
]
},
{
"login": "MMTrooper",
"name": "Michael Mwimali",
"avatar_url": "https://avatars.githubusercontent.com/u/89777534?v=4",
"profile": "https://github.com/MMTrooper",
"contributions": [
"code"
]
},
{
"login": "manuel-munoz-aguirre",
"name": "Manuel Muñoz Aguirre",
"avatar_url": "https://avatars.githubusercontent.com/u/5576458?v=4",
"profile": "https://github.com/manuel-munoz-aguirre",
"contributions": [
"doc"
]
},
{
"login": "morestart",
"name": "ctl",
"avatar_url": "https://avatars.githubusercontent.com/u/35556811",
"profile": "https://github.com/morestart",
"contributions": [
"bug"
]
},
{
"login": "anteemony",
"name": "Anthony Okonneh",
"avatar_url": "https://avatars.githubusercontent.com/u/90141191?v=4",
"profile": "https://github.com/Anteemony",
"contributions": [
"doc"
]
},
{
"login": "ssabarwal",
"name": "Shlok Sabarwal",
"avatar_url": "https://gravatar.com/avatar/cbdbaac712ae282d730cd3028e862d45?s=400&d=robohash&r=x",
"prifle": "https://www.github.com/shlok191/",
"contributions": [
"code"
]
},
{
"login": "mobley-trent",
"name": "Eddy Oyieko",
"avatar_url": "https://avatars.githubusercontent.com/u/67474838?v=4",
"profile": "https://github.com/mobley-trent",
"contributions": [
"code",
"doc"
]
},
{
"login": "toandaominh1997",
"name": "Henry Dao",
"avatar_url": "https://avatars.githubusercontent.com/u/18400648?v=4",
"profile": "https://github.com/toandaominh1997",
"contributions": [
"bug",
"code",
"test"
]
},
{
"login": "slavik57",
"name": "Slava Shpitalny",
"avatar_url": "https://avatars.githubusercontent.com/u/6184997?v=4",
"profile": "https://github.com/slavik57",
"contributions": [
"maintenance"
]
}
]
}
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Please go through the checklist below. Please feel free to remove points if they
- [ ] I've added myself to the [list of contributors](https://github.com/sktime/sktime/blob/main/CONTRIBUTORS.md) with any new badges I've earned :-)
How to: add yourself to the [all-contributors file](https://github.com/sktime/sktime/blob/main/.all-contributorsrc) in the `sktime` root directory (not the `CONTRIBUTORS.md`). Common badges: `code` - fixing a bug, or adding code logic. `doc` - writing or improving documentation or docstrings. `bug` - reporting or diagnosing a bug (get this plus `code` if you also fixed the bug in the PR).`maintenance` - CI, test framework, release.
See here for [full badge reference](https://allcontributors.org/docs/en/emoji-key)
- [ ] Optionally, I've added myself and possibly others to the [CODEOWNERS](https://github.com/sktime/sktime/blob/main/CODEOWNERS) file - do this if you want to become the owner or maintainer of an estimator you added.
- [ ] Optionally, for added estimators: I've added myself and possibly to the `maintainers` tag - do this if you want to become the owner or maintainer of an estimator you added.
See here for further details on the [algorithm maintainer role](https://www.sktime.net/en/latest/get_involved/governance.html#algorithm-maintainers).
- [ ] The PR title starts with either [ENH], [MNT], [DOC], or [BUG]. [BUG] - bugfix, [MNT] - CI, test framework, [ENH] - adding or improving code, [DOC] - writing or improving documentation or docstrings.

Expand Down
1 change: 1 addition & 0 deletions .github/actions/test-component/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ runs:
run: >-
python3
-m pytest
sktime/tests
sktime/${{ inputs.sktime-component-identifier }}
--matrixdesign ${{ inputs.sub-sample-estimators }}
--only_changed_modules ${{ inputs.test-affected-estimators }}
Expand Down
13 changes: 0 additions & 13 deletions .github/workflows/cancel.yml

This file was deleted.

10 changes: 7 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ on:
branches:
- main

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

jobs:
code-quality:
name: code-quality
Expand All @@ -23,7 +27,7 @@ jobs:
run: python3 -m pip install pre-commit
- id: changed-files
name: identify modified files
uses: tj-actions/changed-files@v42
uses: tj-actions/changed-files@v44
- name: run pre-commit hooks on modified files
run: pre-commit run --color always --files ${{ steps.changed-files.outputs.all_changed_files }} --show-diff-on-failure
- name: check missing __init__ files
Expand Down Expand Up @@ -178,7 +182,7 @@ jobs:

test-cython-estimators:
needs: test-nosoftdeps
runs-on: macos-latest
runs-on: macos-13
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -263,7 +267,7 @@ jobs:
fail-fast: false # to not fail all combinations if just one fail
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-13, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
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 @@ -32,7 +32,7 @@ jobs:
- "3.11"
- "3.12"
operating-system:
- macos-latest
- macos-13
- ubuntu-latest
- windows-latest
runs-on: ${{ matrix.operating-system }}
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
- "3.11"
- "3.12"
operating-system:
- macos-latest
- macos-13
- ubuntu-latest
- windows-latest
sktime-component:
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
- "3.11"
- "3.12"
operating-system:
- macos-latest
- macos-13
- ubuntu-latest
- windows-latest
runs-on: ${{ matrix.operating-system }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- "3.11"
- "3.12"
operating-system:
- macos-latest
- macos-13
- ubuntu-latest
- windows-latest
runs-on: ${{ matrix.operating-system }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_datasets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- "3.11"
- "3.12"
operating-system:
- macos-latest
- macos-13
- ubuntu-latest
- windows-latest
runs-on: ${{ matrix.operating-system }}
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
- "3.11"
- "3.12"
operating-system:
- macos-latest
- macos-13
- ubuntu-latest
- windows-latest
runs-on: ${{ matrix.operating-system }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_module.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
- "3.11"
- "3.12"
operating-system:
- macos-latest
- macos-13
- ubuntu-latest
- windows-latest
sktime-component: ${{ fromJSON(needs.detect.outputs.module_changes) }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_other.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- "3.11"
- "3.12"
operating-system:
- macos-latest
- macos-13
- ubuntu-latest
- windows-latest
runs-on: ${{ matrix.operating-system }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/update_contributors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Update Contributors

on:
push:
branches-ignore:
- main
paths:
- '.all-contributorsrc'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
strategy:
fail-fast: false # to not fail all combinations if just one fail
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest, macos-13]
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']

steps:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,5 @@ examples/local/

# py-spy profiler output
profile.svg
test_output/*
mlruns/*

0 comments on commit 0321f22

Please sign in to comment.