This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7087

black: rename pyproject.toml to black.toml
ClosedPublic

Authored by durin42 on Oct 14 2019, 1:01 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG8f89899a5446: black: rename pyproject.toml to black.toml
Summary

Black won't read this automatically (you'll have to specify --config),
but having a pyproject.toml *at all* puts pip in PEP 517/518 mode
which breaks us for obscure reasons I don't understand. Rather than
waste a ton of time fighting with pip, let's just do this.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Oct 14 2019, 1:01 PM
indygreg accepted this revision.Oct 14 2019, 10:58 PM
This revision is now accepted and ready to land.Oct 14 2019, 10:58 PM
durin42 added a commit: rHG8f89899a5446: black: rename pyproject.toml to black.toml.Oct 14 2019, 11:01 PM
Closed by commit rHG8f89899a5446: black: rename pyproject.toml to black.toml (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 17160

black.toml

  • This file was moved from pyproject.toml.

contrib/examples/fix.hgrc

[fix] [fix]
clang-format:command = clang-format --style file -i clang-format:command = clang-format --style file -i
clang-format:pattern = (**.c or **.cc or **.h) and not "listfile:contrib/clang-format-ignorelist" clang-format:pattern = (**.c or **.cc or **.h) and not "listfile:contrib/clang-format-ignorelist"
rustfmt:command = rustfmt {rootpath} rustfmt:command = rustfmt {rootpath}
rustfmt:pattern = set:**.rs rustfmt:pattern = set:**.rs
# We use black, but currently with # We use black, but currently with
# https://github.com/psf/black/pull/826 applied. For now # https://github.com/psf/black/pull/826 applied. For now
# contrib/grey.py is our fork of black. You need to pip install # contrib/grey.py is our fork of black. You need to pip install
# git+https://github.com/python/black/@d9e71a75ccfefa3d9156a64c03313a0d4ad981e5 # git+https://github.com/python/black/@d9e71a75ccfefa3d9156a64c03313a0d4ad981e5
# to have the dependencies for grey. # to have the dependencies for grey.
# #
# black:command = python3.7 contrib/grey.py --quiet --skip-string-normalization - # black:command = python3.7 contrib/grey.py --quiet --config=black.toml --skip-string-normalization -
# black:pattern = set:**.py - hgext/fsmonitor/pywatchman/** - mercurial/thirdparty/** - "contrib/python-zstandard/**" # black:pattern = set:**.py - hgext/fsmonitor/pywatchman/** - mercurial/thirdparty/** - "contrib/python-zstandard/**"

pyproject.toml

  • This file was moved to black.toml.

tests/test-check-code.t

.hgsigs .hgsigs
.hgtags .hgtags
.jshintrc .jshintrc
CONTRIBUTING CONTRIBUTING
CONTRIBUTORS CONTRIBUTORS
COPYING COPYING
Makefile Makefile
README.rst README.rst
black.toml
hg hg
hgeditor hgeditor
hgweb.cgi hgweb.cgi
pyproject.toml
setup.py setup.py
Prevent adding modules which could be shadowed by ancient .so/.dylib. Prevent adding modules which could be shadowed by ancient .so/.dylib.
$ testrepohg files \ $ testrepohg files \
> mercurial/base85.py \ > mercurial/base85.py \
> mercurial/bdiff.py \ > mercurial/bdiff.py \
> mercurial/diffhelpers.py \ > mercurial/diffhelpers.py \