Skip to content

Commit

Permalink
Merge branch 'sktime:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
YHallouard authored Feb 10, 2024
2 parents 95bd5cf + dfed3b3 commit 4a16787
Show file tree
Hide file tree
Showing 502 changed files with 23,503 additions and 3,996 deletions.
134 changes: 133 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,9 @@
"avatar_url": "https://avatars.githubusercontent.com/u/54197164?v=4",
"profile": "https://github.com/achieveordie",
"contributions": [
"test"
"bug",
"code",
"test"
]
},
{
Expand Down Expand Up @@ -285,6 +287,14 @@
"tutorial"
]
},
{
"login": "vnicholson1",
"name": "Vincent Nicholson",
"profile": "https://github.com/vnicholson1",
"contributions": [
"code"
]
},
{
"login": "lnthach",
"name": "Thach Le Nguyen",
Expand All @@ -309,6 +319,14 @@
"tutorial"
]
},
{
"login": "Riyabelle25",
"name": "Riya Elizabeth John",
"avatar_url": "https://avatars.githubusercontent.com/u/55790848?v=4",
"contributions": [
"code"
]
},
{
"login": "ninfueng",
"name": "Ninnart Fuengfusin",
Expand Down Expand Up @@ -2376,6 +2394,15 @@
"code"
]
},
{
"login": "sz85512678",
"name": "Zhen Shao",
"avatar_url": "https://avatars.githubusercontent.com/sz85512678",
"profile": "https://github.com/sz85512678",
"contributions": [
"code"
]
},
{
"login": "Vasudeva-bit",
"name": "Vasudeva Kilaru",
Expand Down Expand Up @@ -2421,6 +2448,16 @@
"avatar_url": "https://avatars.githubusercontent.com/u/19709277?v=4",
"profile": "https://github.com/adamkells",
"contributions": [
"test"
]
},
{
"login": "YHallouard",
"name": "Yann Hallouard",
"avatar_url": "https://avatars.githubusercontent.com/YHallouard",
"profile": "https://www.linkedin.com/in/yann-hallouard/",
"contributions": [
"code",
"test"
]
},
Expand All @@ -2442,6 +2479,101 @@
"bug",
"code"
]
},
{
"login": "rahulporuri",
"name": "Poruri Sai Rahul",
"avatar_url": "https://avatars.githubusercontent.com/u/1926457?v=4",
"profile": "https://github.com/rahulporuri",
"contributions": [
"doc"
]
},
{
"login": "fspinna",
"name": "Francesco Spinnato",
"avatar_url": "https://avatars.githubusercontent.com/u/35352023?v=4",
"profile": "https://github.com/fspinna",
"contributions": [
"code"
]
},
{
"login": "sbuse",
"name": "Simon B.",
"avatar_url": "https://avatars.githubusercontent.com/u/24408707?v=4",
"profile": "https://github.com/sbuse",
"contributions": [
"code"
]
},
{
"login": "sd2k",
"name": "Ben Sully",
"avatar_url": "https://avatars.githubusercontent.com/u/5464991?&v=4",
"profile": "https://github.com/sd2k",
"contributions": [
"bug",
"code"
]
},
{
"login": "wayneadams",
"name": "Wayne Adams",
"avatar_url": "https://avatars.githubusercontent.com/u/15034841?s=400&u=d717e9945910bcc844c5e64cd56d570c6cc4e8e6&v=4",
"profile": "https://github.com/wayneadams",
"contributions": [
"doc"
]
},
{
"login": "sssilvar",
"name": "Santiago Smith Silva",
"avatar_url": "https://avatars.githubusercontent.com/u/16252054?v=4",
"profile": "https://github.com/sssilvar",
"contributions": [
"code"
]
},
{
"login": "DManowitz",
"name": "David Manowitz",
"avatar_url": "https://avatars.githubusercontent.com/u/66927103?v=4",
"profile": "https://github.com/DManowitz",
"contributions": [
"bug",
"maintenance"
]
},
{
"login": "ninedigits",
"name": "Max Frohlich",
"avatar_url": "https://avatars.githubusercontent.com/u/16393653?v=4",
"profile": "https://www.linkedin.com/in/maxfrohlich/",
"contributions": [
"code",
"ideas",
"maintenance"
]
},
{
"login": "steenrotsman",
"name": "Stijn J. Rotman",
"avatar_url": "https://avatars.githubusercontent.com/u/78110080?s=400&v=4",
"profile": "https://github.com/steenrotsman",
"contributions": [
"code",
"doc"
]
},
{
"login": "tvdboom",
"name": "Mavs",
"avatar_url": "https://avatars.githubusercontent.com/u/32366550?v=4",
"profile": "https://github.com/tvdboom",
"contributions": [
"code"
]
}
]
}
4 changes: 1 addition & 3 deletions .binder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# This Dockerfile is used to build sktime when launching binder.
# Find out more at: https://mybinder.readthedocs.io/en/latest/index.html

# Load jupyter python 3.8 image
# 3.8 is the highest currently supported version we can use
FROM jupyter/scipy-notebook:python-3.8.8
FROM jupyter/scipy-notebook:python-3.11.6
# Set up user to avoid running as root
ARG NB_USER
ARG NB_UID
Expand Down
30 changes: 24 additions & 6 deletions .github/actions/test-base/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,41 @@ runs:
steps:
- name: repository checkout step
uses: actions/checkout@v4

- name: update tracking reference step
run: git remote set-branches origin main
shell: bash

- name: shallow clone update step
run: git fetch --depth 1
shell: bash

- name: python environment step
uses: actions/setup-python@v4
with:
python-version: ${{ inputs.python-version-identifier }}
- name: dependencies installation step

- name: Display Python version
run: python -c "import sys; print(sys.version)"
shell: bash

- name: Install sktime and dependencies
run: python3 -m pip install .[tests]
shell: bash

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

- name: Show available branches
run: git branch -a
shell: bash

- name: unit test step
run: python3 -m pytest sktime/base --matrixdesign ${{ inputs.sub-sample-estimators }} --only_changed_modules ${{ inputs.test-affected-estimators }}
run: >-
python3
-m pytest
sktime/base
--matrixdesign ${{ inputs.sub-sample-estimators }}
--only_changed_modules ${{ inputs.test-affected-estimators }}
shell: bash
- name: test coverage step
uses: codecov/codecov-action@v3
with:
flags: ${{ inputs.python-version-identifier }},base
34 changes: 26 additions & 8 deletions .github/actions/test-component/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: test specific sktime component
description: run unit tests on individual component of sktime framework
name: test
description: test
inputs:
sktime-component-identifier:
description: name of sktime component
Expand All @@ -18,23 +18,41 @@ runs:
steps:
- name: repository checkout step
uses: actions/checkout@v4

- name: update tracking reference step
run: git remote set-branches origin main
shell: bash

- name: shallow clone update step
run: git fetch --depth 1
shell: bash

- name: python environment step
uses: actions/setup-python@v4
with:
python-version: ${{ inputs.python-version-identifier }}
- name: dependencies installation step

- name: Display Python version
run: python -c "import sys; print(sys.version)"
shell: bash

- name: Install sktime and dependencies
run: python3 -m pip install .[${{ inputs.sktime-component-identifier }},tests]
shell: bash

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

- name: Show available branches
run: git branch -a
shell: bash

- name: unit test step
run: python3 -m pytest sktime/${{ inputs.sktime-component-identifier }} --matrixdesign ${{ inputs.sub-sample-estimators }} --only_changed_modules ${{ inputs.test-affected-estimators }}
run: >-
python3
-m pytest
sktime/${{ inputs.sktime-component-identifier }}
--matrixdesign ${{ inputs.sub-sample-estimators }}
--only_changed_modules ${{ inputs.test-affected-estimators }}
shell: bash
- name: test coverage step
uses: codecov/codecov-action@v3
with:
flags: ${{ inputs.python-version-identifier }},${{ inputs.sktime-component-identifier }}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: test specific sktime extra
name: test install
description: install individual extra of sktime
inputs:
sktime-extra-identifier:
Expand All @@ -12,10 +12,12 @@ runs:
steps:
- name: repository checkout step
uses: actions/checkout@v4

- name: python environment step
uses: actions/setup-python@v4
with:
python-version: ${{ inputs.python-version-identifier }}

- name: extra installation step
run: python3 -m pip install .[${{ inputs.sktime-extra-identifier }}]
shell: bash
2 changes: 1 addition & 1 deletion .github/workflows/cancel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ jobs:
cancel:
runs-on: ubuntu-latest
steps:
- uses: styfle/[email protected].0
- uses: styfle/[email protected].1
with:
workflow_id: ${{ github.event.workflow.id }}
Loading

0 comments on commit 4a16787

Please sign in to comment.