diff --git a/.github/workflows/pr_core_dep_import.yml b/.github/workflows/pr_core_dep_import.yml index fcd18c4d39..19fb56e294 100644 --- a/.github/workflows/pr_core_dep_import.yml +++ b/.github/workflows/pr_core_dep_import.yml @@ -1,4 +1,4 @@ -name: PR core dep module imports +name: PR module imports on: push: diff --git a/.github/workflows/pr_pytest.yml b/.github/workflows/pr_pytest.yml index 0a5ed4c673..abbb0f596f 100644 --- a/.github/workflows/pr_pytest.yml +++ b/.github/workflows/pr_pytest.yml @@ -48,7 +48,7 @@ jobs: run: python -m pip list - name: Run tests - run: python -m pytest -n logical -k 'not TestAll' + run: python -m pytest -n logical pytest: runs-on: ${{ matrix.os }} diff --git a/aeon/testing/estimator_checking/_estimator_checking.py b/aeon/testing/estimator_checking/_estimator_checking.py index c07815ea89..87bd747f48 100644 --- a/aeon/testing/estimator_checking/_estimator_checking.py +++ b/aeon/testing/estimator_checking/_estimator_checking.py @@ -15,9 +15,6 @@ from sklearn.utils._testing import SkipTest from aeon.base import BaseAeonEstimator -from aeon.testing.estimator_checking._yield_estimator_checks import ( - _yield_all_aeon_checks, -) from aeon.testing.testing_config import ( EXCLUDE_ESTIMATORS, EXCLUDED_TESTS, @@ -75,6 +72,10 @@ class is passed. import pytest + from aeon.testing.estimator_checking._yield_estimator_checks import ( + _yield_all_aeon_checks, + ) + checks = [] for est in estimators: # check if estimator has soft dependencies installed @@ -193,8 +194,13 @@ class is passed. {'check_get_params(estimator=MockClassifier())': 'PASSED'} """ # check if estimator has soft dependencies installed + _check_soft_dependencies("pytest") _check_estimator_deps(estimator) + from aeon.testing.estimator_checking._yield_estimator_checks import ( + _yield_all_aeon_checks, + ) + checks = [] # collect all relevant checks for check in _yield_all_aeon_checks(