From 780048b434133c045e8ba0a82d2bdb6df10757bd Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 31 Jan 2022 18:33:46 +0000 Subject: [PATCH 1/5] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/reorder_python_imports: v2.6.0 → v2.7.1](https://github.com/asottile/reorder_python_imports/compare/v2.6.0...v2.7.1) - [github.com/psf/black: 21.12b0 → 22.1.0](https://github.com/psf/black/compare/21.12b0...22.1.0) - [github.com/asottile/blacken-docs: v1.12.0 → v1.12.1](https://github.com/asottile/blacken-docs/compare/v1.12.0...v1.12.1) --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f03099d..7bdea0e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,15 +34,15 @@ repos: - id: pyupgrade args: [--py36-plus] - repo: https://github.com/asottile/reorder_python_imports - rev: v2.6.0 + rev: v2.7.1 hooks: - id: reorder-python-imports - repo: https://github.com/psf/black - rev: 21.12b0 + rev: 22.1.0 hooks: - id: black - repo: https://github.com/asottile/blacken-docs - rev: v1.12.0 + rev: v1.12.1 hooks: - id: blacken-docs additional_dependencies: [black] From 4eed070a44b7d67ff57e22b7610a69cc5c1619b9 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Tue, 8 Feb 2022 02:19:07 +0100 Subject: [PATCH 2/5] fix. --- .pre-commit-config.yaml | 2 +- .../.pre-commit-config.yaml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7bdea0e..99da73f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -32,7 +32,7 @@ repos: rev: v2.31.0 hooks: - id: pyupgrade - args: [--py36-plus] + args: [--py37-plus] - repo: https://github.com/asottile/reorder_python_imports rev: v2.7.1 hooks: diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index f685c7e..bfbd3c1 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 + rev: v4.1.0 hooks: - id: check-added-large-files args: ['--maxkb=25'] @@ -29,12 +29,12 @@ repos: - id: rst-inline-touching-normal - id: text-unicode-replacement-char - repo: https://github.com/asottile/pyupgrade - rev: v2.29.1 + rev: v2.31.0 hooks: - id: pyupgrade - args: [--py36-plus] + args: [--py37-plus] - repo: https://github.com/asottile/reorder_python_imports - rev: v2.6.0 + rev: v2.7.1 hooks: - id: reorder-python-imports - repo: https://github.com/asottile/setup-cfg-fmt @@ -42,11 +42,11 @@ repos: hooks: - id: setup-cfg-fmt - repo: https://github.com/psf/black - rev: 21.12b0 + rev: 22.1.0 hooks: - id: black - repo: https://github.com/asottile/blacken-docs - rev: v1.12.0 + rev: v1.12.1 hooks: - id: blacken-docs additional_dependencies: [black] @@ -84,11 +84,11 @@ repos: hooks: - id: codespell - repo: https://github.com/guilatrova/tryceratops - rev: v1.0.0 + rev: v1.0.1 hooks: - id: tryceratops - repo: https://github.com/pre-commit/mirrors-mypy - rev: 'v0.910-1' + rev: 'v0.931' hooks: - id: mypy args: [ From 053565786541634f97466b6716b80872bcbfd6ee Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Tue, 8 Feb 2022 02:32:34 +0100 Subject: [PATCH 3/5] Fix. --- tests/test_cookie.py | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 1 - {{cookiecutter.project_slug}}/environment.yml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/test_cookie.py b/tests/test_cookie.py index e4c99c2..5b10f45 100644 --- a/tests/test_cookie.py +++ b/tests/test_cookie.py @@ -101,7 +101,7 @@ def test_check_conda_environment_creation_and_run_all_checks(cookies): assert result.exit_code == 0 assert result.exception is None - if sys.platform != "win32": + if sys.platform == "linux": # Switch branch before pre-commit because otherwise failure because on main # branch. subprocess.run( diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index bfbd3c1..e77e3b1 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -11,7 +11,6 @@ repos: - id: debug-statements - id: end-of-file-fixer - id: fix-byte-order-marker - - id: forbid-new-submodules - id: mixed-line-ending - id: no-commit-to-branch args: [--branch, main] diff --git a/{{cookiecutter.project_slug}}/environment.yml b/{{cookiecutter.project_slug}}/environment.yml index 581a0e0..6a21a69 100644 --- a/{{cookiecutter.project_slug}}/environment.yml +++ b/{{cookiecutter.project_slug}}/environment.yml @@ -14,7 +14,7 @@ dependencies: - conda-lock # Package dependencies - - pytask + - pytask >=0.1.7 # Misc - black From 5c805c3ae841fb73e4d4b5363c03d1f6eed66921 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Wed, 9 Feb 2022 00:02:56 +0100 Subject: [PATCH 4/5] dont fix py version for mypy pre-commit. --- .pre-commit-config.yaml | 1 - {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 99da73f..729026b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -93,7 +93,6 @@ repos: --ignore-missing-imports, ] pass_filenames: false - language_version: "3.9" - repo: meta hooks: - id: check-hooks-apply diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index e77e3b1..b706528 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -95,7 +95,6 @@ repos: --ignore-missing-imports, ] pass_filenames: false - language_version: "3.9" - repo: meta hooks: - id: check-hooks-apply From b5e013e1e5b01a3681f42d7324a7c26e74ff5e80 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Wed, 9 Feb 2022 00:04:09 +0100 Subject: [PATCH 5/5] allow test on macos. --- tests/test_cookie.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_cookie.py b/tests/test_cookie.py index 5b10f45..e4c99c2 100644 --- a/tests/test_cookie.py +++ b/tests/test_cookie.py @@ -101,7 +101,7 @@ def test_check_conda_environment_creation_and_run_all_checks(cookies): assert result.exit_code == 0 assert result.exception is None - if sys.platform == "linux": + if sys.platform != "win32": # Switch branch before pre-commit because otherwise failure because on main # branch. subprocess.run(