Merge branch 'master' into fix-resource-warnings-tests

This commit is contained in:
Mickaël Schoentgen
2018-09-01 16:03:01 +02:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -1,3 +1,3 @@
Be cordial or be on your way.
PyPA Projects are governed by the PyPA code of conduct available here:
https://www.kennethreitz.org/essays/be-cordial-or-be-on-your-way
https://www.pypa.io/en/latest/code-of-conduct/
+1 -1
View File
@@ -114,5 +114,5 @@ def _verify_python3_env():
raise RuntimeError('Click will abort further execution because Python 3 '
'was configured to use ASCII as encoding for the '
'environment. Consult http://click.pocoo.org/python3/'
'environment. Consult http://click.pocoo.org/python3/ '
'for mitigation steps.' + extra)