From 12c2551f297a8b0e510acb37ce5253783b0d2078 Mon Sep 17 00:00:00 2001 From: Adi Roiban Date: Tue, 20 Mar 2018 14:37:02 +0000 Subject: [PATCH] Update after review. --- admin/pycodestyle-twisted.py | 52 ++++++++++++++++++------------------ tox.ini | 4 +-- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/admin/pycodestyle-twisted.py b/admin/pycodestyle-twisted.py index 243270ec5..e6ee93da2 100755 --- a/admin/pycodestyle-twisted.py +++ b/admin/pycodestyle-twisted.py @@ -1,32 +1,32 @@ #!/usr/bin/env python +# +# Copyright 2006-2009 Johann C. Rocholl +# Copyright 2009-2014 Florent Xicluna +# Copyright 2014-2018 Ian Lee + +# Licensed under the terms of the Expat License + +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation files +# (the "Software"), to deal in the Software without restriction, +# including without limitation the rights to use, copy, modify, merge, +# publish, distribute, sublicense, and/or sell copies of the Software, +# and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: + +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. """ -Copyright 2006-2009 Johann C. Rocholl -Copyright 2009-2014 Florent Xicluna -Copyright 2014-2018 Ian Lee - -Licensed under the terms of the Expat License - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation files -(the "Software"), to deal in the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - A patched version for pycodestyle which uses the blank line conversion from Twisted. diff --git a/tox.ini b/tox.ini index 4766a8b07..c0ef5f531 100644 --- a/tox.ini +++ b/tox.ini @@ -25,8 +25,8 @@ ; coverage results to codecov.io. It should be called after running the ; standard coverage environment. ; -; A non-default `txchecker-travis` and `cipycodestyle` environments are -; used to run on Travis-CI in --diff mode +; A non-default `txchecker-travis` environment is used to run twistedchecker +; on travis in --diff mode ; [tox] minversion=2.4