From 52dfe5cf43253f6a852ca775134895fd8edbb059 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Wed, 31 Dec 2025 11:52:08 +0100 Subject: [PATCH 1/5] chore: update install docs and typing command --- README.md | 19 +++++++++++++++---- justfile | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0d831be..51f32ae 100644 --- a/README.md +++ b/README.md @@ -20,11 +20,11 @@ pytask-r is available on [PyPI](https://pypi.org/project/pytask-r) and [Anaconda.org](https://anaconda.org/conda-forge/pytask-r). Install it with ```console -$ pip install pytask-r +$ uv add pytask-r # or -$ conda install -c conda-forge pytask-r +$ pixi add pytask-r ``` You also need to have R installed and `Rscript` on your command line. Test it by typing @@ -34,14 +34,16 @@ the following on the command line Rscript --help ``` -If an error is shown instead of a help page, you can install R with `conda`. +If an error is shown instead of a help page, you can install R with `pixi`. ```console -conda install -c conda-forge r-base +pixi add r-base ``` Or install install R from the official [R Project](https://www.r-project.org/). +For serializing task data, install either `r-jsonlite` for JSON or `r-yaml` for YAML. + ## Usage To create a task that runs an R script, define a task function with the `@mark.r` @@ -246,3 +248,12 @@ r_options = ["--vanilla"] ## Changes Consult the [release notes](CHANGES.md) to find out about what is new. + +## Developer + +To run the tests, `r-base` and its dependencies need to be installed. The recommended +command is + +```console +pixi global install r-base --with r-jsonlite --with r-yaml +``` diff --git a/justfile b/justfile index 46b6b8d..58668b7 100644 --- a/justfile +++ b/justfile @@ -12,7 +12,7 @@ test-cov *FLAGS: # Run type checking typing: - uv run --group typing --group test ty check src/ tests/ + uv run --group typing --group test --isolated ty check src/ tests/ # Run linting lint: From 928a401cb42ad0f2e62283970e1d1f53410fcb97 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Wed, 31 Dec 2025 12:49:27 +0100 Subject: [PATCH 2/5] chore: bump ty minimum to 0.0.8 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c7089ae..7285155 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,7 +36,7 @@ pytask_r = "pytask_r.plugin" [dependency-groups] test = ["pytask-parallel", "pytest", "pytest-cov", "pytest-xdist", "pyyaml"] -typing = ["ty>=0.0.7"] +typing = ["ty>=0.0.8"] [build-system] requires = ["hatchling", "hatch-vcs"] From 122de8f1e8a02846e35c621b16c5e521a8ae3e4c Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Wed, 31 Dec 2025 12:54:26 +0100 Subject: [PATCH 3/5] chore: add weekly dependabot for uv --- .github/dependabot.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 718572b..6483b1d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,7 +1,6 @@ version: 2 - updates: - - package-ecosystem: "github-actions" + - package-ecosystem: "uv" directory: "/" schedule: interval: "weekly" From 6418b625769b23ae677ad206ca9cdaa2f04623fe Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Wed, 31 Dec 2025 13:06:56 +0100 Subject: [PATCH 4/5] chore: add github-actions dependabot updates --- .github/dependabot.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6483b1d..c766b7e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,5 +1,9 @@ version: 2 updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" - package-ecosystem: "uv" directory: "/" schedule: From ffbd4e60fe7d3a8a009aa97624271bc2a6e6e698 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Wed, 31 Dec 2025 15:42:13 +0100 Subject: [PATCH 5/5] chore: group github-actions dependabot updates --- .github/dependabot.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c766b7e..be4ca53 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,9 +1,14 @@ version: 2 + updates: - package-ecosystem: "github-actions" directory: "/" schedule: interval: "weekly" + groups: + github-actions: + patterns: + - "*" - package-ecosystem: "uv" directory: "/" schedule: