From 89930eb5128f3b8cba2c59caa85b382273a36cb3 Mon Sep 17 00:00:00 2001 From: Matthew Middlehurst Date: Wed, 19 Jun 2024 23:50:43 +0100 Subject: [PATCH 1/2] v0.4.0 --- MANIFEST.in | 12 ++++++------ README.md | 2 +- pyproject.toml | 9 +++------ tsml_eval/__init__.py | 2 +- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 11854992..482129db 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,13 +1,8 @@ -recursive-include docs * -recursive-include examples * -recursive-include results * recursive-include tsml_eval *.py recursive-include tsml_eval/datasets *.ts *.csv *.txt recursive-include tsml_eval/publications *.csv *.txt *.ipynb recursive-include tsml_eval/testing/_test_eval_files *.csv *.pdf *.pickle recursive-include tsml_eval/testing/_test_results_files *.csv -include .coveragerc -include conftest.py include LICENSE include MANIFEST.in include pyproject.toml @@ -15,10 +10,15 @@ include README.md recursive-exclude .binder * recursive-exclude .github * -recursive-exclude build_tools * recursive-exclude _tsml_research_resources * +recursive-exclude build_tools * +recursive-exclude docs * +recursive-exclude examples * +recursive-exclude results * exclude .codecov.yml +exclude .coveragerc exclude .gitattributes exclude .gitignore exclude .pre-commit-config.yaml exclude .readthedocs.yml +exclude conftest.py diff --git a/README.md b/README.md index 16d6de97..80ecba06 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ `tsml-eval` contains benchmarking and evaluation tools for time series machine learning algorithms. -The current release of `tsml-eval` is v0.3.0. +The current release of `tsml-eval` is v0.4.0. ## Installation diff --git a/pyproject.toml b/pyproject.toml index 52f6b9b0..cab2d07e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "tsml-eval" -version = "0.3.0" +version = "0.4.0" description = "A package for benchmarking time series machine learning tools." authors = [ {name = "Matthew Middlehurst", email = "m.b.middlehurst@soton.ac.uk"}, @@ -34,13 +34,12 @@ classifiers = [ "Operating System :: Unix", "Operating System :: MacOS", "Programming Language :: Python", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", ] -requires-python = ">=3.8,<3.13" +requires-python = ">=3.9,<3.13" dependencies = [ "aeon>=0.9.0,<0.10.0", "tsml>=0.4.0,<0.5.0", @@ -55,7 +54,6 @@ all_extras = [ "aeon[all_extras,dl]", "tsml[all_extras]", "xgboost", - "torch>=1.13.1", ] unstable_extras = [ "aeon[unstable_extras]", @@ -63,7 +61,6 @@ unstable_extras = [ ] deep_learning = [ "aeon[dl]", - "torch>=1.13.1", ] dev = [ "pre-commit", @@ -79,7 +76,7 @@ binder = [ "jupyterlab", ] docs = [ - "sphinx<8.0.0", + "sphinx<7.4.0", "sphinx-design", "sphinx-version-warning", "sphinx_issues", diff --git a/tsml_eval/__init__.py b/tsml_eval/__init__.py index 706039ed..de33e534 100644 --- a/tsml_eval/__init__.py +++ b/tsml_eval/__init__.py @@ -1,3 +1,3 @@ """tsml-eval.""" -__version__ = "0.3.0" +__version__ = "0.4.0" From c87f77adfc302488fba9500cfa189967c793c087 Mon Sep 17 00:00:00 2001 From: Matthew Middlehurst Date: Wed, 19 Jun 2024 23:54:31 +0100 Subject: [PATCH 2/2] pytest workflow versions --- .github/workflows/periodic_tests.yml | 2 +- .github/workflows/pr_pytest.yml | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/periodic_tests.yml b/.github/workflows/periodic_tests.yml index 72f8fbfc..3fc40ae6 100644 --- a/.github/workflows/periodic_tests.yml +++ b/.github/workflows/periodic_tests.yml @@ -81,7 +81,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-20.04, macos-13, windows-2022 ] - python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ] + python-version: [ "3.9", "3.10", "3.11", "3.12" ] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/pr_pytest.yml b/.github/workflows/pr_pytest.yml index 560dc732..10cad079 100644 --- a/.github/workflows/pr_pytest.yml +++ b/.github/workflows/pr_pytest.yml @@ -24,15 +24,13 @@ jobs: fail-fast: false matrix: os: [ ubuntu-20.04, windows-2022 ] - python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ] + python-version: [ "3.9", "3.10", "3.11", "3.12" ] # skip python versions unless the PR has the 'full pytest actions' label pr-testing: - ${{ (github.event_name != 'pull_request' || !contains(github.event.pull_request.labels.*.name, 'full pytest actions')) }} exclude: - pr-testing: true - python-version: "3.9" - - pr-testing: true - python-version: "3.11" + python-version: "3.10" steps: - uses: actions/checkout@v4