From 65f8f31dabc593d98fd120570f49b8ef2cf0efc5 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Sun, 1 Jun 2025 19:12:25 +0200 Subject: [PATCH 1/2] Use only uv. --- .github/workflows/main.yml | 22 +++++++--------------- CHANGES.md | 3 ++- tox.ini | 15 --------------- 3 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 tox.ini diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2aa60df..2ed71f2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,9 +5,6 @@ concurrency: group: ${{ github.head_ref || github.run_id }} cancel-in-progress: true -env: - CONDA_EXE: mamba - on: push: branches: @@ -25,13 +22,10 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 + - uses: astral-sh/setup-uv@v5 with: - python-version-file: .python-version - allow-prereleases: true - cache: pip - - run: pip install tox-uv - - run: tox -e typing + enable-cache: true + - run: uv run --extra typing mypy run-tests: @@ -48,18 +42,16 @@ jobs: - uses: actions/checkout@v4 - uses: r-lib/actions/setup-tinytex@v2 if: runner.os != 'Windows' - - uses: actions/setup-python@v5 + - uses: astral-sh/setup-uv@v5 with: + enable-cache: true python-version: ${{ matrix.python-version }} - cache: pip - allow-prereleases: true - - run: pip install tox # Unit, integration, and end-to-end tests. - name: Run unit tests and doctests. shell: bash -l {0} - run: tox -e pytest -- -m "unit or (not integration and not end_to_end)" --cov=./ --cov-report=xml -n auto + run: uv run --extra test pytest -- -m "unit or (not integration and not end_to_end)" --cov=./ --cov-report=xml -n auto - name: Upload coverage report for unit tests and doctests. if: runner.os == 'Linux' && matrix.python-version == '3.10' @@ -68,7 +60,7 @@ jobs: - name: Run end-to-end tests. shell: bash -l {0} - run: tox -e pytest -- -m end_to_end --cov=./ --cov-report=xml -n auto + run: uv run --extra test pytest -- -m end_to_end --cov=./ --cov-report=xml -n auto - name: Upload coverage reports of end-to-end tests. if: runner.os == 'Linux' && matrix.python-version == '3.10' diff --git a/CHANGES.md b/CHANGES.md index b7766da..26f2a36 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,10 +4,11 @@ This is a record of all past pytask-latex releases and what went into them in re chronological order. Releases follow [semantic versioning](https://semver.org/) and all releases are available on [Anaconda.org](https://anaconda.org/conda-forge/pytask-latex). -## 0.4.3 - 2025-06-xx +## 0.4.3 - 2025-06-01 - {pull}`75` adds rye. - {pull}`81` adds support for Python 3.13 and drops support for Python 3.8. +- {pull}`82` remove setup with tox-uv. ## 0.4.2 - 2023-11-30 diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 11b16f3..0000000 --- a/tox.ini +++ /dev/null @@ -1,15 +0,0 @@ -[tox] -envlist = pytest - -[testenv] -usedevelop = true -passenv = CI - -[testenv:pytest] -extras = test -commands = - pytest {posargs} - -[testenv:typing] -extras = typing -commands = mypy From ed290c51a20bd85a933ca0babc03e70e91860e55 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Sun, 1 Jun 2025 19:14:49 +0200 Subject: [PATCH 2/2] Fix. --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2ed71f2..b2cbf70 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,7 +51,7 @@ jobs: - name: Run unit tests and doctests. shell: bash -l {0} - run: uv run --extra test pytest -- -m "unit or (not integration and not end_to_end)" --cov=./ --cov-report=xml -n auto + run: uv run --extra test pytest -m "unit or (not integration and not end_to_end)" --cov=./ --cov-report=xml -n auto - name: Upload coverage report for unit tests and doctests. if: runner.os == 'Linux' && matrix.python-version == '3.10' @@ -60,7 +60,7 @@ jobs: - name: Run end-to-end tests. shell: bash -l {0} - run: uv run --extra test pytest -- -m end_to_end --cov=./ --cov-report=xml -n auto + run: uv run --extra test pytest -m end_to_end --cov=./ --cov-report=xml -n auto - name: Upload coverage reports of end-to-end tests. if: runner.os == 'Linux' && matrix.python-version == '3.10'