diff options
| author | Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com> | 2020-11-28 11:14:27 +0100 |
|---|---|---|
| committer | Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com> | 2020-11-28 11:14:27 +0100 |
| commit | 073e56beb56a9d011eee84974ac8ffb72a5b0f13 (patch) | |
| tree | ec12d4fee16c14431311644a61364e54003c1e94 | |
| parent | 303defef04aa1a60dc74a4e52fef0bcf05c3d6be (diff) | |
| download | setuptools-scm-073e56beb56a9d011eee84974ac8ffb72a5b0f13.tar.gz | |
pre-commit update
| -rw-r--r-- | .pre-commit-config.yaml | 9 | ||||
| -rw-r--r-- | testing/test_git.py | 3 | ||||
| -rw-r--r-- | testing/test_mercurial.py | 5 |
3 files changed, 9 insertions, 8 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a417dec..0063a11 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,19 +1,22 @@ exclude: setuptools_scm/win_py31_compat.py repos: - repo: https://github.com/ambv/black - rev: 19.10b0 + rev: 20.8b1 hooks: - id: black args: [--safe, --quiet] - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.5.0 + rev: v3.3.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer - id: check-yaml - id: debug-statements +- repo: https://gitlab.com/pycqa/flake8 + rev: 3.8.4 + hooks: - id: flake8 - repo: https://github.com/asottile/pyupgrade - rev: v2.3.0 + rev: v2.7.4 hooks: - id: pyupgrade diff --git a/testing/test_git.py b/testing/test_git.py index 3980281..6f5246c 100644 --- a/testing/test_git.py +++ b/testing/test_git.py @@ -286,8 +286,7 @@ def test_non_dotted_tag_no_version_match(wd): @pytest.mark.issue("https://github.com/pypa/setuptools_scm/issues/381") def test_gitdir(monkeypatch, wd): - """ - """ + """""" wd.commit_testfile() normal = wd.version # git hooks set this and break subsequent setuptools_scm unless we clean diff --git a/testing/test_mercurial.py b/testing/test_mercurial.py index 29370c1..815ca00 100644 --- a/testing/test_mercurial.py +++ b/testing/test_mercurial.py @@ -152,8 +152,7 @@ def test_version_bump_from_merge_commit(wd): @pytest.mark.usefixtures("version_1_0") def test_version_bump_from_commit_including_hgtag_mods(wd): - """ Test the case where a commit includes changes to .hgtags and other files - """ + """Test the case where a commit includes changes to .hgtags and other files""" with wd.cwd.joinpath(".hgtags").open("ab") as tagfile: tagfile.write(b"0 0\n") wd.write("branchfile", "branchtext") @@ -166,7 +165,7 @@ def test_version_bump_from_commit_including_hgtag_mods(wd): @pytest.mark.issue(229) @pytest.mark.usefixtures("version_1_0") def test_latest_tag_detection(wd): - """ Tests that tags not containing a "." are ignored, the same as for git. + """Tests that tags not containing a "." are ignored, the same as for git. Note that will be superceded by the fix for pypa/setuptools_scm/issues/235 """ wd('hg tag some-random-tag -u test -d "0 0"') |