Merge branch 'main' into ajb/impute

# Conflicts: # aeon/forecasting/compose/_reduce.py # aeon/forecasting/compose/tests/test_pipeline.py # aeon/transformations/tests/test_compose.py
aeon-toolkit · Aug 1, 2024 · c989982 · c989982
2 parents e44a991 + 3ac8417
commit c989982
Show file tree

Hide file tree

Showing 83 changed files with 1,655 additions and 2,306 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -2437,6 +2437,43 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "IRKnyazev",
+      "name": "Ivan Knyazev",
+      "avatar_url": "https://avatars.githubusercontent.com/u/105492484?v=4",
+      "profile": "https://github.com/IRKnyazev",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Cyril-Meyer",
+      "name": "Cyril Meyer",
+      "avatar_url": "https://avatars.githubusercontent.com/u/69190238?v=4",
+      "profile": "https://github.com/Cyril-Meyer",
+      "contributions": [
+        "test"
+      ]
+    },
+    {
+      "login": "Moonzyyy",
+      "name": "Daniele Carli",
+      "avatar_url": "https://avatars.githubusercontent.com/u/47296443?v=4",
+      "profile": "https://github.com/Moonzyyy",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "adm-unl",
+      "name": "Adam Unal",
+      "avatar_url": "https://avatars.githubusercontent.com/u/143117979?v=4",
+      "profile": "https://github.com/adm-unl",
+      "contributions": [
+        "doc"
+      ]
     }
-  ]
+  ],
+  "commitType": "docs"
 }
diff --git a/.github/workflows/pr_precommit.yml b/.github/workflows/pr_precommit.yml
@@ -17,8 +17,19 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
+      - name: Create app token
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ vars.PR_APP_ID }}
+          private-key: ${{ secrets.PR_APP_KEY }}
+
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.head_ref }}
+          token: ${{ steps.app-token.outputs.token }}
 
       - name: Setup Python 3.10
         uses: actions/setup-python@v5
@@ -45,22 +56,6 @@ jobs:
           extra_args: --files ${{ steps.changed-files.outputs.all_changed_files }}
 
       # push fixes if pre-commit fails and PR is eligible
-      - if: ${{ failure() && github.event_name == 'pull_request_target' && !github.event.pull_request.draft && !contains(github.event.pull_request.labels.*.name, 'stop pre-commit fixes') }}
-        name: Create app token
-        uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ vars.PR_APP_ID }}
-          private-key: ${{ secrets.PR_APP_KEY }}
-
-      - if: ${{ failure() && github.event_name == 'pull_request_target' && !github.event.pull_request.draft && !contains(github.event.pull_request.labels.*.name, 'stop pre-commit fixes') }}
-        name: Checkout
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.head_ref }}
-          token: ${{ steps.app-token.outputs.token }}
-
       - if: ${{ failure() && github.event_name == 'pull_request_target' && !github.event.pull_request.draft && !contains(github.event.pull_request.labels.*.name, 'stop pre-commit fixes') }}
         name: Push pre-commit fixes
         uses: stefanzweifel/git-auto-commit-action@v5

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -27,7 +27,7 @@ jobs:
           persist-credentials: false
 
       - name: Run analysis
-        uses: ossf/scorecard-action@v2.3.3
+        uses: ossf/scorecard-action@v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -29,13 +29,13 @@ repos:
         args: [ "--create", "--python-folders", "aeon" ]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.2
+    rev: v0.5.5
     hooks:
       - id: ruff
         args: [ "--fix"]
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.16.0
+    rev: v3.17.0
     hooks:
       - id: pyupgrade
         args: [ "--py38-plus" ]

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
diff --git a/aeon/classification/deep_learning/__init__.py b/aeon/classification/deep_learning/__init__.py
@@ -3,6 +3,7 @@
 __all__ = [
     "BaseDeepClassifier",
     "CNNClassifier",
+    "TimeCNNClassifier",
     "EncoderClassifier",
     "FCNClassifier",
     "InceptionTimeClassifier",
@@ -13,7 +14,7 @@
     "LITETimeClassifier",
     "IndividualLITEClassifier",
 ]
-from aeon.classification.deep_learning._cnn import CNNClassifier
+from aeon.classification.deep_learning._cnn import CNNClassifier, TimeCNNClassifier
 from aeon.classification.deep_learning._encoder import EncoderClassifier
 from aeon.classification.deep_learning._fcn import FCNClassifier
 from aeon.classification.deep_learning._inception_time import (