From 2ba0399052c4daff495976094726bd976c64d0ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= Date: Wed, 4 Sep 2024 13:28:33 +0100 Subject: [PATCH] fix(CI): feature/py3 has been merged, refer to master now MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This causes problems with forks that don't have feature/py3. Although would it then compare with the fork's master branch which would still be out-of-date? Signed-off-by: Edwin Török --- .pre-commit-config.yaml | 4 ++-- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 124645bd875..e8fb2f37e0e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -67,7 +67,7 @@ repos: name: check that the Python3 test suite in passes entry: env PYTHONDEVMODE=yes sh -c 'coverage run && coverage xml && coverage html && coverage report && - diff-cover --ignore-whitespace --compare-branch=origin/feature/py3 + diff-cover --ignore-whitespace --compare-branch=origin/master --show-uncovered --html-report .git/coverage-diff.html --fail-under 50 .git/coverage3.11.xml' require_serial: true @@ -111,7 +111,7 @@ repos: stages: [push] name: check that changes to python3 tree pass pylint entry: diff-quality --violations=pylint - --ignore-whitespace --compare-branch=origin/feature/py3 + --ignore-whitespace --compare-branch=origin/master pass_filenames: false language: python types: [python] diff --git a/pyproject.toml b/pyproject.toml index 55467081438..512eac89030 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -275,7 +275,7 @@ xfail_strict = true # is used to fail tests that are marked as xfail but pass(f [tool.pytype_reporter] -default_branch = "feature/py3" +default_branch = "master" discard_messages_matching = [ "Couldn't import pyi for 'xml.dom.minidom'", "No attribute '.*' on RRDContentHandler",