From 8f6fe9edf87c151cb6a4cda529865da3116b95b0 Mon Sep 17 00:00:00 2001 From: timonmerk Date: Thu, 19 Sep 2024 15:20:24 +0200 Subject: [PATCH] - Bump package version to 0.06dev - Bump Python version to 3.11 - Bump pybispectra version to 1.2.0 - Fix testing workflow --- .github/workflows/tests.yml | 48 +++++++++++++++++++++---------------- pyproject.toml | 6 ++--- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8128642f..9392ea63 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,21 +3,21 @@ on: push: branches: - main - - '**' + - "**" paths-ignore: - - 'docs/**' - - '*.md' - - '*.rst' - - '*.txt' + - "docs/**" + - "*.md" + - "*.rst" + - "*.txt" pull_request: branches: - main - - '*.x' + - "*.x" paths-ignore: - - 'docs/**' - - '*.md' - - '*.rst' - - '*.txt' + - "docs/**" + - "*.md" + - "*.rst" + - "*.txt" jobs: tests: name: ${{ matrix.platform.name }} Python ${{ matrix.python }} @@ -33,21 +33,27 @@ jobs: - os: windows-latest name: Windows python: - - '3.10' + - "3.11" + - "3.12" steps: - uses: actions/checkout@v4 - name: Install and cache Linux packages if: ${{ runner.os == 'Linux' }} - uses: tecolicom/actions-use-apt-tools@v1 + uses: awalsh128/cache-apt-pkgs-action@latest with: - tools: binutils qtbase5-dev qt5-qmake libpugixml1v5 - - name: Set up Python with uv - uses: drivendataorg/setup-python-uv-action@v1 + packages: binutils qtbase5-dev qt5-qmake libpugixml1v5 + - name: Install uv + uses: astral-sh/setup-uv@v3 with: - python-version: ${{ matrix.python }} - cache: packages - cache-dependency-path: pyproject.toml - - name: Install test dependencies - run: uv pip install .[test] + version: "0.4.12" + enable-cache: true + cache-dependency-glob: "**/pyproject.toml" + - name: Install Python and dependencies + run: | + uv python install ${{ matrix.python }} + uv venv + uv pip install .[test] - name: Run tests - run: pytest -n auto tests/ + run: | + ${{ (runner.os == 'Windows' && 'echo "Activating environment" && .venv\Scripts\activate') || 'echo "Activating environment" &&source .venv/bin/activate' }} + pytest -n auto tests/ diff --git a/pyproject.toml b/pyproject.toml index 717129d6..35e0e30c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ requires = ["hatchling"] [project] name = "py_neuromodulation" -version = "0.0.4" +version = "0.06dev" authors = [{ name = "Timon Merk", email = "timon.merk@charite.de" }] classifiers = [ "Development Status :: 2 - Pre-Alpha", @@ -26,7 +26,7 @@ keywords = [ license = { file = "LICENSE" } maintainers = [{ name = "Timon Merk" }] readme = "README.rst" -requires-python = ">=3.11" +requires-python = ">= 3.11" dependencies = [ "mne", @@ -41,7 +41,7 @@ dependencies = [ "scikit-learn >= 0.24.2", "scikit-optimize", "scipy >= 1.7.1", - "pybispectra >= 1.0.0", + "pybispectra >= 1.2.0", "pyparrm", "pyarrow>=14.0.2", "joblib>=1.3.2",