From acf29cf659182da2a92efc5d2ff9ffc5f6712ea5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 13 Sep 2021 18:56:33 +0000 Subject: [PATCH 1/4] [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/pyupgrade: v2.25.0 → v2.26.0](https://github.com/asottile/pyupgrade/compare/v2.25.0...v2.26.0) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 69f5a3f..7ef5958 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,7 +23,7 @@ repos: - id: isort name: isort (python) - repo: https://github.com/asottile/pyupgrade - rev: v2.25.0 + rev: v2.26.0 hooks: - id: pyupgrade args: [--py37-plus] From f5c2026dcf3a6c46108a45d37287762e42805ed9 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 13 Sep 2021 18:57:15 +0000 Subject: [PATCH 2/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- tests/system/utils/test_main.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/system/utils/test_main.py b/tests/system/utils/test_main.py index 4403582..6a329f0 100644 --- a/tests/system/utils/test_main.py +++ b/tests/system/utils/test_main.py @@ -103,10 +103,7 @@ def test_open_graphical_browser(monkeypatch): # Just assert that this internal attribute still exists and behaves the way # expected - if sys.version_info < (3, 7): - iter(webbrowser._tryorder) - else: - assert webbrowser._tryorder is None + assert webbrowser._tryorder is None monkeypatch.setattr("webbrowser._tryorder", []) From 2e3521442152dc0b2f5df70e1e01977d86f9cb19 Mon Sep 17 00:00:00 2001 From: Hugo Osvaldo Barrera Date: Mon, 13 Sep 2021 21:16:22 +0200 Subject: [PATCH 3/4] Remove unused import --- tests/system/utils/test_main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/system/utils/test_main.py b/tests/system/utils/test_main.py index 6a329f0..d7c25fd 100644 --- a/tests/system/utils/test_main.py +++ b/tests/system/utils/test_main.py @@ -1,5 +1,4 @@ import logging -import sys import aiohttp import click_log From 87574be5475493b13d37feb2b7be35249acf3ddb Mon Sep 17 00:00:00 2001 From: Hugo Osvaldo Barrera Date: Mon, 13 Sep 2021 21:23:52 +0200 Subject: [PATCH 4/4] Stop running pre-commit twice --- .builds/tests-release.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.builds/tests-release.yaml b/.builds/tests-release.yaml index ef5c4d2..dce61f7 100644 --- a/.builds/tests-release.yaml +++ b/.builds/tests-release.yaml @@ -29,11 +29,6 @@ tasks: export PATH=$PATH:~/.local/bin/ make -e ci-test make -e ci-test-storage - - style: | - cd vdirsyncer - # Non-system python is used for packages: - export PATH=$PATH:~/.local/bin/ - make -e style - check-secrets: | # Stop here if this is a PR. PRs can't run with the below secrets. [ -f ~/fastmail-secrets ] || complete-build