From 55eeaf227f56b6bf453678a6c2167293e82a352a Mon Sep 17 00:00:00 2001 From: Enno Hermann Date: Sat, 11 Jan 2025 00:01:53 +0100 Subject: [PATCH] build: update dev dependencies --- .github/actions/setup-uv/action.yml | 5 +++-- .github/workflows/style_check.yml | 6 ------ .github/workflows/tests.yml | 6 ------ .pre-commit-config.yaml | 4 ++-- TTS/utils/generic_utils.py | 4 ++-- pyproject.toml | 6 +++--- 6 files changed, 10 insertions(+), 21 deletions(-) diff --git a/.github/actions/setup-uv/action.yml b/.github/actions/setup-uv/action.yml index c7dd4f5f99..88a73e8481 100644 --- a/.github/actions/setup-uv/action.yml +++ b/.github/actions/setup-uv/action.yml @@ -4,8 +4,9 @@ runs: using: 'composite' steps: - name: Install uv - uses: astral-sh/setup-uv@v4 + uses: astral-sh/setup-uv@v5 with: - version: "0.5.4" + version: "0.5.17" enable-cache: true cache-dependency-glob: "**/pyproject.toml" + python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/style_check.yml b/.github/workflows/style_check.yml index d1060f6be2..03426808cc 100644 --- a/.github/workflows/style_check.yml +++ b/.github/workflows/style_check.yml @@ -9,15 +9,9 @@ on: jobs: lint: runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.9] steps: - uses: actions/checkout@v4 - name: Setup uv uses: ./.github/actions/setup-uv - - name: Set up Python ${{ matrix.python-version }} - run: uv python install ${{ matrix.python-version }} - name: Lint check run: make lint diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7905add3f7..58be50da40 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,8 +28,6 @@ jobs: - uses: actions/checkout@v4 - name: Setup uv uses: ./.github/actions/setup-uv - - name: Set up Python ${{ matrix.python-version }} - run: uv python install ${{ matrix.python-version }} - name: Install Espeak if: contains(fromJSON('["inference_tests", "test_text"]'), matrix.subset) run: | @@ -72,8 +70,6 @@ jobs: - uses: actions/checkout@v4 - name: Setup uv uses: ./.github/actions/setup-uv - - name: Set up Python ${{ matrix.python-version }} - run: uv python install ${{ matrix.python-version }} - name: Install Espeak if: contains(fromJSON('["test_tts", "test_tts2", "test_xtts"]'), matrix.subset) run: | @@ -116,8 +112,6 @@ jobs: - uses: actions/checkout@v4 - name: Setup uv uses: ./.github/actions/setup-uv - - name: Set up Python ${{ matrix.python-version }} - run: uv python install ${{ matrix.python-version }} - name: Install Espeak run: | sudo apt-get update diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 62420e9958..97542c8cc3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,12 +8,12 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: "https://github.com/psf/black" - rev: 24.2.0 + rev: 24.10.0 hooks: - id: black language_version: python3 - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.7.0 + rev: v0.9.1 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] diff --git a/TTS/utils/generic_utils.py b/TTS/utils/generic_utils.py index 77566c3f6a..090522493b 100644 --- a/TTS/utils/generic_utils.py +++ b/TTS/utils/generic_utils.py @@ -80,9 +80,9 @@ def format_aux_input(def_args: Dict, kwargs: Dict) -> Dict: Dict: arguments with formatted auxilary inputs. """ kwargs = kwargs.copy() - for name in def_args: + for name, arg in def_args.items(): if name not in kwargs or kwargs[name] is None: - kwargs[name] = def_args[name] + kwargs[name] = arg return kwargs diff --git a/pyproject.toml b/pyproject.toml index 4b87a10b20..fa58e5b934 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -136,11 +136,11 @@ all = [ [dependency-groups] dev = [ - "black==24.2.0", + "black==24.10.0", "coverage[toml]>=7", - "pre-commit>=3", + "pre-commit>=4", "pytest>=8", - "ruff==0.7.0", + "ruff==0.9.1", ] # Dependencies for building the documentation docs = [