Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pre-commit.ci] pre-commit autoupdate #52

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/enhancement.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ______________________________________________________________________
#### Is your feature request related to a problem?

Provide a description of what the problem is, e.g. "I wish I could use pytask-r to do
\[...\]".
[...]".

#### Describe the solution you'd like

Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-added-large-files
args: ['--maxkb=100']
Expand All @@ -18,7 +18,7 @@ repos:
- id: python-use-type-annotations
- id: text-unicode-replacement-char
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.4.2
rev: v0.11.2
hooks:
- id: ruff
- id: ruff-format
Expand All @@ -27,7 +27,7 @@ repos:
hooks:
- id: refurb
- repo: https://github.com/executablebooks/mdformat
rev: 0.7.17
rev: 0.7.22
hooks:
- id: mdformat
additional_dependencies: [
Expand All @@ -36,7 +36,7 @@ repos:
]
args: [--wrap, "88"]
- repo: https://github.com/codespell-project/codespell
rev: v2.2.6
rev: v2.4.1
hooks:
- id: codespell
- repo: meta
Expand Down
2 changes: 1 addition & 1 deletion src/pytask_r/serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from pytask import PTask
from pytask import PTaskWithPath

__all__ = ["create_path_to_serialized", "serialize_keyword_arguments", "SERIALIZERS"]
__all__ = ["SERIALIZERS", "create_path_to_serialized", "serialize_keyword_arguments"]

_HIDDEN_FOLDER = ".pytask/pytask-r"

Expand Down
4 changes: 2 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@


parametrize_parse_code_serializer_suffix = pytest.mark.parametrize(
"parse_config_code, serializer, suffix",
("parse_config_code", "serializer", "suffix"),
[
(
"library(jsonlite); args <- commandArgs(trailingOnly=TRUE); "
Expand Down Expand Up @@ -92,6 +92,6 @@ def invoke(self, *args, **kwargs):
return super().invoke(*args, **kwargs)


@pytest.fixture()
@pytest.fixture
def runner():
return CustomCliRunner()
5 changes: 3 additions & 2 deletions tests/test_collect.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@

import pytest
from pytask import Mark

from pytask_r.collect import _parse_r_mark
from pytask_r.collect import r
from pytask_r.serialization import SERIALIZERS


@pytest.mark.unit()
@pytest.mark.unit
@pytest.mark.parametrize(
("args", "kwargs", "expectation", "expected"),
[
Expand Down Expand Up @@ -43,7 +44,7 @@ def test_r(args, kwargs, expectation, expected):
assert result == expected


@pytest.mark.unit()
@pytest.mark.unit
@pytest.mark.parametrize(
(
"mark",
Expand Down
2 changes: 1 addition & 1 deletion tests/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from pytask import build


@pytest.mark.end_to_end()
@pytest.mark.end_to_end
def test_marker_is_configured(tmp_path):
session = build(paths=tmp_path)
assert "r" in session.config["markers"]
22 changes: 11 additions & 11 deletions tests/test_execute.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
from pytask import Task
from pytask import build
from pytask import cli
from pytask_r.execute import pytask_execute_task_setup

from pytask_r.execute import pytask_execute_task_setup
from tests.conftest import needs_rscript
from tests.conftest import parametrize_parse_code_serializer_suffix


@pytest.mark.unit()
@pytest.mark.unit
def test_pytask_execute_task_setup(monkeypatch):
"""Make sure that the task setup raises errors."""
# Act like r is installed since we do not test this.
Expand All @@ -33,7 +33,7 @@ def test_pytask_execute_task_setup(monkeypatch):


@needs_rscript
@pytest.mark.end_to_end()
@pytest.mark.end_to_end
@parametrize_parse_code_serializer_suffix
@pytest.mark.parametrize("depends_on", ["'in_1.txt'", "['in_1.txt', 'in_2.txt']"])
def test_run_r_script( # noqa: PLR0913
Expand Down Expand Up @@ -70,7 +70,7 @@ def task_run_r_script(produces = Path("out.txt")): ...


@needs_rscript
@pytest.mark.end_to_end()
@pytest.mark.end_to_end
@parametrize_parse_code_serializer_suffix
def test_run_r_script_w_task_decorator(
runner, tmp_path, parse_config_code, serializer, suffix
Expand Down Expand Up @@ -100,7 +100,7 @@ def run_r_script(): ...


@needs_rscript
@pytest.mark.end_to_end()
@pytest.mark.end_to_end
@parametrize_parse_code_serializer_suffix
def test_raise_error_if_rscript_is_not_found(
tmp_path, monkeypatch, parse_config_code, serializer, suffix
Expand Down Expand Up @@ -132,7 +132,7 @@ def task_run_r_script(): ...


@needs_rscript
@pytest.mark.end_to_end()
@pytest.mark.end_to_end
@parametrize_parse_code_serializer_suffix
def test_run_r_script_w_saving_workspace(
runner, tmp_path, parse_config_code, serializer, suffix
Expand Down Expand Up @@ -167,7 +167,7 @@ def task_run_r_script(): ...


@needs_rscript
@pytest.mark.end_to_end()
@pytest.mark.end_to_end
@parametrize_parse_code_serializer_suffix
def test_run_r_script_w_wrong_cmd_option(
runner, tmp_path, parse_config_code, serializer, suffix
Expand Down Expand Up @@ -202,7 +202,7 @@ def task_run_r_script(): ...


@needs_rscript
@pytest.mark.end_to_end()
@pytest.mark.end_to_end
def test_run_r_script_w_custom_serializer(runner, tmp_path):
task_source = """
import pytask
Expand Down Expand Up @@ -232,7 +232,7 @@ def task_run_r_script(): ...


@needs_rscript
@pytest.mark.end_to_end()
@pytest.mark.end_to_end
def test_run_r_script_fails_w_multiple_markers(runner, tmp_path):
task_source = """
import pytask
Expand All @@ -252,7 +252,7 @@ def task_run_r_script(): ...


@needs_rscript
@pytest.mark.end_to_end()
@pytest.mark.end_to_end
def test_run_r_script_with_capital_extension(runner, tmp_path):
task_source = """
import pytask
Expand Down Expand Up @@ -280,7 +280,7 @@ def task_run_r_script(): ...


@needs_rscript
@pytest.mark.end_to_end()
@pytest.mark.end_to_end
@parametrize_parse_code_serializer_suffix
def test_run_r_script_w_nested_inputs(
runner, tmp_path, parse_config_code, serializer, suffix
Expand Down
2 changes: 1 addition & 1 deletion tests/test_normal_execution_w_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from pytask import cli


@pytest.mark.end_to_end()
@pytest.mark.end_to_end
@pytest.mark.parametrize(
"dependencies",
[(), ("in.txt",), ("in_1.txt", "in_2.txt")],
Expand Down
6 changes: 3 additions & 3 deletions tests/test_parallel.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@


@needs_rscript
@pytest.mark.end_to_end()
@pytest.mark.end_to_end
@parametrize_parse_code_serializer_suffix
def test_parallel_parametrization_over_source_files_w_loop(
runner, tmp_path, parse_config_code, serializer, suffix
Expand Down Expand Up @@ -69,7 +69,7 @@ def task_execute_r_script():


@needs_rscript
@pytest.mark.end_to_end()
@pytest.mark.end_to_end
@parametrize_parse_code_serializer_suffix
def test_parallel_parametrization_over_source_file_w_loop(
runner, tmp_path, parse_config_code, serializer, suffix
Expand Down Expand Up @@ -106,7 +106,7 @@ def execute_r_script():


@needs_rscript
@pytest.mark.end_to_end()
@pytest.mark.end_to_end
@parametrize_parse_code_serializer_suffix
@pytest.mark.xfail(reason="@task does not support partialed functions.")
def test_parallel_parametrization_over_source_file_w_loop_and_lambda(
Expand Down
4 changes: 2 additions & 2 deletions tests/test_parametrize.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


@needs_rscript
@pytest.mark.end_to_end()
@pytest.mark.end_to_end
@parametrize_parse_code_serializer_suffix
def test_parametrized_execution_of_r_script_w_loop(
runner, tmp_path, parse_config_code, serializer, suffix
Expand Down Expand Up @@ -53,7 +53,7 @@ def task_run_r_script():


@needs_rscript
@pytest.mark.end_to_end()
@pytest.mark.end_to_end
@parametrize_parse_code_serializer_suffix
def test_parametrize_r_options_and_product_paths_w_loop(
runner, tmp_path, parse_config_code, serializer, suffix
Expand Down