From f8725b5f76f008e54ddc0ef032e3c470dde4b7b3 Mon Sep 17 00:00:00 2001 From: Marc Weitz Date: Mon, 26 Aug 2024 16:24:53 +0200 Subject: [PATCH] General maintenance (#24) * sets upper limit of tensorflow to avoid problems with the LSTM models (fixes #23) * adds support for python 3.11 and 3.12 * updates Github Actions * removes macos and windows support until better tensorflow implementations are available * updates package version --- .github/workflows/python-test.yml | 12 ++++++------ pyproject.toml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml index ef7ed45..7184259 100644 --- a/.github/workflows/python-test.yml +++ b/.github/workflows/python-test.yml @@ -16,17 +16,17 @@ jobs: os: [ ubuntu-latest, #windows-latest, - macOS-latest + #macOS-latest ] - python-version: ['3.9', '3.10'] + python-version: ['3.9', '3.10', '3.11', '3.12'] poetry-version: [1.7.1] fail-fast: false runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -51,7 +51,7 @@ jobs: run: poetry config virtualenvs.in-project true - name: Set up cache - uses: actions/cache@v2 + uses: actions/cache@v4 id: cache with: path: .venv @@ -64,7 +64,7 @@ jobs: run: poetry run pytest --cov=paat --cov-report=xml --disable-pytest-warnings - name: Upload coverage to Codecov - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v4 with: file: ./coverage.xml flags: unittests diff --git a/pyproject.toml b/pyproject.toml index 227e0e2..77b6524 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "paat" -version = "1.0.0b3" +version = "1.0.0b4" description = "A comprehensive toolbox to analyse and model raw physical activity data" license = "MIT" @@ -27,7 +27,7 @@ classifiers = [ ] [tool.poetry.dependencies] -python = ">=3.9,<3.11" # Compatible python versions must be declared here +python = ">=3.9,<3.12" # Compatible python versions must be declared here pandas = "^1.5.3" psutil = "^5.8.0" glob2 = "^0.7" @@ -35,7 +35,7 @@ resampy = "^0.2.2" joblib = "^1.0.1" numpy = "1.23.5" bitstring = "^3.1.7" -tensorflow = "^2.11.0" +tensorflow = ">=2.11.0,<2.16" torch = "^1.10.1" agcounts = "^0.1.1" toml = "^0.10.2"