Mercurial > hg
changeset 46455:5be886200eb6
ci-fix: backed out changeset d4c8b4b90ecb
This changeset is part of a series that break Continuous integration on python 2
for about a week. As not concrete solution have been found so far the safer
seems to back it out until we can figure the details out.
Differential Revision: https://phab.mercurial-scm.org/D9947
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 02 Feb 2021 15:35:38 +0100 |
| parents | 6b847757dd8d |
| children | 1e26b882d704 |
| files | black.toml contrib/examples/fix.hgrc pyproject.toml tests/test-check-code.t tests/test-check-format.t |
| diffstat | 5 files changed, 17 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/black.toml Tue Feb 02 15:35:38 2021 +0100 @@ -0,0 +1,14 @@ +[tool.black] +line-length = 80 +exclude = ''' +build/ +| wheelhouse/ +| dist/ +| packages/ +| \.hg/ +| \.mypy_cache/ +| \.venv/ +| mercurial/thirdparty/ +''' +skip-string-normalization = true +quiet = true
--- a/contrib/examples/fix.hgrc Mon Feb 01 17:13:24 2021 -0500 +++ b/contrib/examples/fix.hgrc Tue Feb 02 15:35:38 2021 +0100 @@ -5,7 +5,7 @@ rustfmt:command = rustfmt +nightly rustfmt:pattern = set:"**.rs" - "mercurial/thirdparty/**" -black:command = black +black:command = black --config=black.toml - black:pattern = set:**.py - mercurial/thirdparty/** # Mercurial doesn't have any Go code, but if we did this is how we
--- a/pyproject.toml Mon Feb 01 17:13:24 2021 -0500 +++ b/pyproject.toml Tue Feb 02 15:35:38 2021 +0100 @@ -1,18 +1,3 @@ [build-system] requires = ["setuptools", "wheel"] build-backend = "setuptools.build_meta" - -[tool.black] -line-length = 80 -exclude = ''' -build/ -| wheelhouse/ -| dist/ -| packages/ -| \.hg/ -| \.mypy_cache/ -| \.venv/ -| mercurial/thirdparty/ -''' -skip-string-normalization = true -quiet = true
--- a/tests/test-check-code.t Mon Feb 01 17:13:24 2021 -0500 +++ b/tests/test-check-code.t Tue Feb 02 15:35:38 2021 +0100 @@ -66,6 +66,7 @@ COPYING Makefile README.rst + black.toml hg hgeditor hgweb.cgi
--- a/tests/test-check-format.t Mon Feb 01 17:13:24 2021 -0500 +++ b/tests/test-check-format.t Tue Feb 02 15:35:38 2021 +0100 @@ -1,5 +1,5 @@ #require black test-repo $ cd $RUNTESTDIR/.. - $ black --check --diff `hg files 'set:(**.py + grep("^#!.*python")) - mercurial/thirdparty/**'` + $ black --config=black.toml --check --diff `hg files 'set:(**.py + grep("^#!.*python")) - mercurial/thirdparty/**'`