too much stuff

Author: MatthewMiddlehurst

.codecov.yml

@@ -24,4 +24,3 @@ github_checks:
 ignore:
   - ".github/"
   - "docs/"
-  - "examples/"

.pre-commit-config.yaml

@@ -4,13 +4,20 @@ repos:
     hooks:
     - id: check-added-large-files
       args: ["--maxkb=10000"]
+    - id: check-ast
     - id: check-case-conflict
+    - id: check-docstring-first
     - id: check-merge-conflict
     - id: check-symlinks
+    - id: check-toml
     - id: check-yaml
     - id: debug-statements
     - id: end-of-file-fixer
+    - id: fix-byte-order-marker
     - id: fix-encoding-pragma
+      args: ["--remove"]
+    - id: name-tests-test
+      args: ["--pytest-test-first"]
     - id: requirements-txt-fixer
     - id: trailing-whitespace
 
@@ -19,7 +26,7 @@ repos:
     hooks:
       - id: isort
         name: isort (python)
-        args: ["--profile=black"]
+        args: [ "--profile=black", "--multi-line=3" ]
 
   - repo: https://github.com/psf/black
     rev: 23.1.0
@@ -32,26 +39,27 @@ repos:
     hooks:
       - id: flake8
         additional_dependencies: [ flake8-bugbear, flake8-print, Flake8-pyproject ]
+        args: [ "--max-line-length=88", "--extend-ignore=E203" ]
 
   - repo: https://github.com/nbQA-dev/nbQA
     rev: 1.6.1
     hooks:
       - id: nbqa-isort
         additional_dependencies: [ isort==5.10.1 ]
-        args: [ "--nbqa-dont-skip-bad-cells" ]
+        args: [ "--nbqa-dont-skip-bad-cells", "--profile=black", "--multi-line=3" ]
       - id: nbqa-black
         additional_dependencies: [ black==22.10.0 ]
         args: [ "--nbqa-dont-skip-bad-cells" ]
       - id: nbqa-flake8
         additional_dependencies: [ flake8==5.0.4 ]
-        args: [ "--nbqa-dont-skip-bad-cells", "--extend-ignore=E402,E203" ]
+        args: [ "--nbqa-dont-skip-bad-cells", "--extend-ignore=E402,E203", "--max-line-length=88" ]
 
   - repo: https://github.com/pycqa/pydocstyle
     rev: 6.3.0
     hooks:
       - id: pydocstyle
-        args: ["--convention=numpy", "--match=^((?!_wip).)*$"]
-        additional_dependencies: [ toml ]
+        args: ["--convention=numpy"]
+        additional_dependencies: [ toml, tomli ]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.0.1

MANIFEST.in

@@ -1,2 +1,3 @@
-recursive-include tsml *.py *.ts
+recursive-include tsml *.py
+recursive-include tsml/datasets *.ts
 include LICENSE

pyproject.toml

@@ -63,14 +63,20 @@ dev = [
     "pytest-xdist",
     "pytest-cov",
 ]
+binder = [
+    "notebook",
+    "jupyterlab",
+]
 docs = [
     "sphinx",
     "sphinx-design",
-    "sphinx-gallery",
     "nbsphinx",
     "numpydoc",
     "jupyter",
     "furo",
+    "sphinx_issues",
+    "myst-parser",
+    "sphinx-copybutton",
 ]
 
 [project.urls]
@@ -92,15 +98,10 @@ ignore = [
     ".coveragerc",
 ]
 
-[tool.flake8]
-max-line-length = 88
-extend-ignore = ["E203"]
-
 [tool.pytest.ini_options]
+testpaths = "tsml"
 addopts = '''
-    --ignore examples
-    --ignore docs
-    --durations 10
+    --durations 20
     --timeout 600
     --showlocals
     --doctest-modules

tsml/base.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Base classes for estimators."""
 
 __author__ = ["MatthewMiddlehurst"]
@@ -267,13 +266,8 @@ def get_test_params(
         params : dict or list of dict
             Parameters to create testing instances of the class.
         """
-        if parameter_set is None:
-            # default parameters = empty dict
-            return {}
-        else:
-            raise ValueError(
-                f"No parameter set {parameter_set} defined for {cls.__name__}"
-            )
+        # default parameters = empty dict
+        return {}
 
 
 def _clone_estimator(

tsml/compose/__init__.py

@@ -1,7 +1,11 @@
-# -*- coding: utf-8 -*-
 """Composable estimators."""
 
 __all__ = [
-    # "ChannelEnsembleClassifier",
-    # "ChannelEnsembleRegressor",
+    "ChannelEnsembleClassifier",
+    "ChannelEnsembleRegressor",
 ]
+
+from tsml.compose._channel_ensemble import (
+    ChannelEnsembleClassifier,
+    ChannelEnsembleRegressor,
+)