Patchwork D6993: black: add a pyproject.toml that contains our black settings

login
register
mail settings
Submitter phabricator
Date Oct. 6, 2019, 1:50 p.m.
Message ID <differential-rev-PHID-DREV-26gtpcdu3py2jyvioncd-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/42002/
State Superseded
Headers show

Comments

phabricator - Oct. 6, 2019, 1:50 p.m.
durin42 created this revision.
Herald added subscribers: mercurial-devel, mjpieters.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6993

AFFECTED FILES
  pyproject.toml
  tests/test-check-code.t

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mjpieters, mercurial-devel
phabricator - Oct. 13, 2019, 5:03 a.m.
mharbison72 added a comment.


  I'm baffled, but this causes test-install.t to fail on Windows:
  
    $ ./run-tests.py --local test-install.t
    running 1 tests using 1 parallel processes
    
    --- c:/Users/Matt/hg/tests/test-install.t
    +++ c:/Users/Matt/hg/tests/test-install.t.err
    @@ -255,26 +255,23 @@
       $ ./installenv/*/pip install --no-index $TESTDIR/.. >> pip.log
       DEPRECATION: Python 2.7 will reach the end of its life on January 1st, 2020. Please upgrade your Python as Python 2.7 won't be maintained after that date. A future version of pip will drop support for Python
    2.7. (?)
       DEPRECATION: Python 2.7 will reach the end of its life on January 1st, 2020. Please upgrade your Python as Python 2.7 won't be maintained after that date. A future version of pip will drop support for Python
    2.7. More details about Python 2 support in pip, can be found at https://pip.pypa.io/en/latest/development/release-process/#python-2-support (?)
    +  Command "$TESTTMP\\installenv\\scripts\\python.exe -m pip install --ignore-installed --no-user --prefix c:\\users\\matt\\appdata\\local\\temp\\pip-build-env-b0jc5i --no-warn-script-location --no-binary :none: --only-binary :none: --no-index -- setuptools>=38.2.5 wheel" failed with error code 1 in None\r (esc)
    +  [1]
       $ ./installenv/*/hg debuginstall || cat pip.log
    -  checking encoding (ascii)...
    -  checking Python executable (*) (glob)
    -  checking Python version (2.*) (glob) (no-py3 !)
    -  checking Python version (3.*) (glob) (py3 !)
    -  checking Python lib (*)... (glob)
    -  checking Python security support (*) (glob)
    -    TLS 1.2 not supported by Python install; network connections lack modern security (?)
    -    SNI not supported by Python install; may have connectivity issues with some servers (?)
    -  checking Mercurial version (*) (glob)
    -  checking Mercurial custom build (*) (glob)
    -  checking module policy (*) (glob)
    -  checking installed modules (*/mercurial)... (glob)
    -  checking registered compression engines (*) (glob)
    -  checking available compression engines (*) (glob)
    -  checking available compression engines for wire protocol (*) (glob)
    -  checking "re2" regexp engine \((available|missing)\) (re)
    -  checking templates ($TESTTMP/installenv/*/site-packages/mercurial/templates)... (glob)
    -  checking default template ($TESTTMP/installenv/*/site-packages/mercurial/templates/map-cmdline.default) (glob)
    -  checking commit editor... (*) (glob)
    -  checking username (test)
    -  no problems detected
    +  $TESTTMP.sh: line 95: ./installenv/*/hg: $ENOENT$
    +  checking Python version (3.*) (glob) (py3 !)
    +    TLS 1.2 not supported by Python install; network connections lack modern security (?)
    +    SNI not supported by Python install; may have connectivity issues with some servers (?)
    +  New python executable in $TESTTMP\\installenv\\Scripts\\python.exe\r (esc)
    +  Installing setuptools, pip, wheel...\r (esc)
    +  done.\r (esc)
    +  Processing c:\\users\\matt\\hg\r (esc)
    +    Installing build dependencies: started\r (esc)
    +    Installing build dependencies: finished with status 'error'\r (esc)
    +    Complete output from command $TESTTMP\\installenv\\scripts\\python.exe -m pip install --ignore-installed --no-user --prefix c:\\users\\matt\\appdata\\local\\temp\\pip-build-env-b0jc5i --no-warn-script-location --no-binary :none: --only-binary :none: --no-index -- setuptools>=38.2.5 wheel:\r (esc)
    +    Collecting setuptools>=38.2.5\r (esc)
    +      Could not find a version that satisfies the requirement setuptools>=38.2.5 (from versions: )\r (esc)
    +    No matching distribution found for setuptools>=38.2.5\r (esc)
    +    \r (esc)
    +    ----------------------------------------\r (esc)
     #endif
    
    ERROR: test-install.t output changed
  
  I had setuptools 39.0.1 installed, and upgraded to 41.4.0.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6993/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6993

To: durin42, #hg-reviewers, indygreg
Cc: mharbison72, mjpieters, mercurial-devel
phabricator - Oct. 14, 2019, 2:29 p.m.
durin42 added a comment.


  Ugh, weird. I think this is an issue around setuptools versions, but I'll try and ask dstufft this week. :(

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6993/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6993

To: durin42, #hg-reviewers, indygreg
Cc: mharbison72, mjpieters, mercurial-devel
phabricator - Oct. 14, 2019, 3:57 p.m.
indygreg added a comment.


  We're seeing this with the latest version of pip/setuptools: https://ci.hg.gregoryszorc.com/job-info/hg-committed-649a9601b9e2642fa0ef12e6ad51ac85ab6e860c-debian10-cpython-2.7-0#failed-tests.
  
  But it only happens when we're using the self-installed Python/pip/setuptools: it doesn't reproduce with Debian 10's built-in/system Python/pip/setuptools. So it is plausible it is only an issue with modern pip/setuptools. That's believable, since pyproject.toml support is relatively new.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6993/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6993

To: durin42, #hg-reviewers, indygreg
Cc: mharbison72, mjpieters, mercurial-devel

Patch

diff --git a/tests/test-check-code.t b/tests/test-check-code.t
--- a/tests/test-check-code.t
+++ b/tests/test-check-code.t
@@ -66,6 +66,7 @@ 
   hg
   hgeditor
   hgweb.cgi
+  pyproject.toml
   setup.py
 
 Prevent adding modules which could be shadowed by ancient .so/.dylib.
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
--- /dev/null
+++ b/pyproject.toml
@@ -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/'