Skip to content

Commit 70ca0e8

Browse files
[pre-commit.ci] pre-commit autoupdate (#40)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Tobias Raabe <raabe@posteo.de>
1 parent 000ba58 commit 70ca0e8

File tree

5 files changed

+29
-23
lines changed

5 files changed

+29
-23
lines changed

.github/workflows/main.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,22 @@ jobs:
2727
fail-fast: false
2828
matrix:
2929
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
30-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
30+
python-version: ['3.8', '3.9', '3.10', '3.11']
3131

3232
steps:
3333
- uses: actions/checkout@v4
34-
- uses: conda-incubator/setup-miniconda@v2
34+
- uses: mamba-org/setup-micromamba@v1
3535
with:
36-
auto-update-conda: false
37-
python-version: ${{ matrix.python-version }}
38-
channels: conda-forge,nodefaults
39-
miniforge-variant: Mambaforge
36+
environment-name: gha-testing
37+
condarc: |
38+
channels:
39+
- nodefaults
40+
- conda-forge
41+
create-args: >-
42+
python=${{ matrix.python-version }}
43+
mamba
44+
tox-conda
45+
cache-environment: true
4046

4147
- name: Install core dependencies.
4248
shell: bash -l {0}
@@ -49,7 +55,7 @@ jobs:
4955
run: tox -e pytest -- -m "unit or (not integration and not end_to_end)" --cov=./ --cov-report=xml -n auto
5056

5157
- name: Upload coverage report for unit tests and doctests.
52-
if: runner.os == 'Linux' && matrix.python-version == '3.8'
58+
if: runner.os == 'Linux' && matrix.python-version == '3.10'
5359
shell: bash -l {0}
5460
run: bash <(curl -s https://codecov.io/bash) -F unit -c
5561

@@ -58,6 +64,6 @@ jobs:
5864
run: tox -e pytest -- -m end_to_end --cov=./ --cov-report=xml -n auto
5965

6066
- name: Upload coverage reports of end-to-end tests.
61-
if: runner.os == 'Linux' && matrix.python-version == '3.8'
67+
if: runner.os == 'Linux' && matrix.python-version == '3.10'
6268
shell: bash -l {0}
6369
run: bash <(curl -s https://codecov.io/bash) -F end_to_end -c

.pre-commit-config.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@ repos:
1717
- id: python-no-log-warn
1818
- id: python-use-type-annotations
1919
- id: text-unicode-replacement-char
20-
- repo: https://github.com/asottile/reorder_python_imports
21-
rev: v3.9.0
20+
- repo: https://github.com/asottile/reorder-python-imports
21+
rev: v3.12.0
2222
hooks:
2323
- id: reorder-python-imports
2424
args: [--py37-plus, --add-import, 'from __future__ import annotations']
2525
- repo: https://github.com/asottile/setup-cfg-fmt
26-
rev: v2.2.0
26+
rev: v2.5.0
2727
hooks:
2828
- id: setup-cfg-fmt
2929
- repo: https://github.com/psf/black
30-
rev: 23.3.0
30+
rev: 23.9.1
3131
hooks:
3232
- id: black
33-
- repo: https://github.com/charliermarsh/ruff-pre-commit
34-
rev: v0.0.261
33+
- repo: https://github.com/astral-sh/ruff-pre-commit
34+
rev: v0.0.292
3535
hooks:
3636
- id: ruff
3737
- repo: https://github.com/dosisod/refurb
38-
rev: v1.15.0
38+
rev: v1.21.0
3939
hooks:
4040
- id: refurb
4141
args: [--ignore, FURB126]
@@ -45,7 +45,7 @@ repos:
4545
- id: interrogate
4646
args: [-v, --fail-under=40, src, tests]
4747
- repo: https://github.com/executablebooks/mdformat
48-
rev: 0.7.16
48+
rev: 0.7.17
4949
hooks:
5050
- id: mdformat
5151
additional_dependencies: [
@@ -54,11 +54,11 @@ repos:
5454
]
5555
args: [--wrap, "88"]
5656
- repo: https://github.com/codespell-project/codespell
57-
rev: v2.2.4
57+
rev: v2.2.6
5858
hooks:
5959
- id: codespell
6060
- repo: https://github.com/pre-commit/mirrors-mypy
61-
rev: 'v1.2.0'
61+
rev: 'v1.5.1'
6262
hooks:
6363
- id: mypy
6464
args: [

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ url = https://github.com/pytask-dev/pytask-r
77
author = Tobias Raabe
88
author_email = raabe@posteo.de
99
license = MIT
10-
license_file = LICENSE
10+
license_files = LICENSE
1111
platforms = any
1212
classifiers =
1313
Development Status :: 4 - Beta
@@ -28,7 +28,7 @@ install_requires =
2828
click
2929
pybaum>=0.1.1
3030
pytask>=0.3
31-
python_requires = >=3.7
31+
python_requires = >=3.8
3232
include_package_data = True
3333
package_dir = =src
3434
zip_safe = False

src/pytask_r/collect.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def run_r_script(script: Path, options: list[str], serialized: Path) -> None:
2525
"""Run an R script."""
2626
cmd = ["Rscript", script.as_posix(), *options, str(serialized)]
2727
print("Executing " + " ".join(cmd) + ".") # noqa: T201
28-
subprocess.run(cmd, check=True)
28+
subprocess.run(cmd, check=True) # noqa: S603
2929

3030

3131
@hookimpl

src/pytask_r/shared.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ def r(
1515
*,
1616
script: str | Path,
1717
options: str | Iterable[str] | None = None,
18-
serializer: str | Callable[..., str] | str | None = None,
18+
serializer: str | Callable[..., str] | None = None,
1919
suffix: str | None = None,
2020
) -> tuple[
2121
str | Path | None,
2222
str | Iterable[str] | None,
23-
str | Callable[..., str] | str | None,
23+
str | Callable[..., str] | None,
2424
str | None,
2525
]:
2626
"""Parse input to the ``@pytask.mark.r`` decorator.

0 commit comments

Comments
 (0)