black: rename pyproject.toml to black.toml
authorAugie Fackler <augie@google.com>
Mon, 14 Oct 2019 12:46:32 -0400
changeset 43222 8f89899a5446
parent 43221 0e2a2fab4b2e
child 43223 15c05732d177
black: rename pyproject.toml to black.toml 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. Differential Revision: https://phab.mercurial-scm.org/D7087
black.toml
contrib/examples/fix.hgrc
pyproject.toml
tests/test-check-code.t
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/black.toml	Mon Oct 14 12:46:32 2019 -0400
@@ -0,0 +1,3 @@
+[tool.black]
+line-length = 80
+exclude = 'build/|wheelhouse/|dist/|packages/|\.hg/|\.mypy_cache/|\.venv/|mercurial/thirdparty/|hgext/fsmonitor/pywatchman/|contrib/python-zstandard/'
--- a/contrib/examples/fix.hgrc	Sat Oct 12 15:12:54 2019 -0700
+++ b/contrib/examples/fix.hgrc	Mon Oct 14 12:46:32 2019 -0400
@@ -11,5 +11,5 @@
 # git+https://github.com/python/black/@d9e71a75ccfefa3d9156a64c03313a0d4ad981e5
 # 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/**"
--- a/pyproject.toml	Sat Oct 12 15:12:54 2019 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-[tool.black]
-line-length = 80
-exclude = 'build/|wheelhouse/|dist/|packages/|\.hg/|\.mypy_cache/|\.venv/|mercurial/thirdparty/|hgext/fsmonitor/pywatchman/|contrib/python-zstandard/'
--- a/tests/test-check-code.t	Sat Oct 12 15:12:54 2019 -0700
+++ b/tests/test-check-code.t	Mon Oct 14 12:46:32 2019 -0400
@@ -64,10 +64,10 @@
   COPYING
   Makefile
   README.rst
+  black.toml
   hg
   hgeditor
   hgweb.cgi
-  pyproject.toml
   setup.py
 
 Prevent adding modules which could be shadowed by ancient .so/.dylib.