Bump the version of hacking to 1.1.0, with few fixes

Also switch to pycodestyle from pep8 which requires a bump
of the the version of flake8 too.

Skip the following checks for now:
- E123 Closing bracket does not match indentation of opening bracket's line
- E226 Missing whitespace around arithmetic operator
- E402 Module level import not at top of file
- E731 Do not assign a lambda expression, use a def
- W503 Line break occurred before a binary operator

They should be probably revisited and fixed, if possible,
or skipped individually using # noqa

The following checks reported a limited number of errors and
they were fixed directly in this review:
- E241 Multiple spaces after ','
- E501 Line too long (82 > 79 characters)

Change-Id: I1f185d2efd1adf27a26e3ac93f2e1011c0b63124
This commit is contained in:
Luigi Toscano 2018-11-26 19:03:02 +01:00
parent 2ff2d85371
commit 61b0b2e038
12 changed files with 22 additions and 15 deletions

View File

@ -32,14 +32,14 @@ eventlet==0.18.2
extras==1.0.0
fasteners==0.14.1
fixtures==3.0.0
flake8==2.5.5
flake8==2.6.2
Flask==1.0.2
future==0.16.0
futurist==1.6.0
gitdb2==2.0.3
GitPython==2.1.8
greenlet==0.4.13
hacking==0.12.0
hacking==1.1.0
idna==2.6
imagesize==1.0.0
iso8601==0.1.11
@ -91,7 +91,6 @@ paramiko==2.0.0
Paste==2.0.3
PasteDeploy==1.5.2
pbr==2.0.0
pep8==1.5.7
pika-pool==0.1.3
pika==0.10.0
prettytable==0.7.2
@ -99,6 +98,7 @@ psycopg2==2.6.2
pyasn1==0.4.2
pycadf==2.7.0
pycparser==2.18
pycodestyle==2.4.0
pyflakes==0.8.1
Pygments==2.2.0
pyinotify==0.9.6

View File

@ -120,7 +120,8 @@ class Oozie(s.Service):
@el.provision_event(instance_reference=1)
@g.remote_command(1)
def _rebuild_oozie_war(self, remote, cluster_context):
cmd = 'cp -f /opt/mapr-repository/ext-2.2.zip %(home)s/libext/ext-2.2.zip &&' \
cmd = 'cp -f /opt/mapr-repository/ext-2.2.zip ' \
'%(home)s/libext/ext-2.2.zip &&' \
' %(home)s/bin/oozie-setup.sh -hadoop %(version)s' \
' /opt/mapr/hadoop/hadoop-%(version)s'
args = {'home': self.home_dir(cluster_context),

View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import pep8
import pycodestyle
import re
import tokenize
@ -106,7 +106,7 @@ def use_jsonutils(logical_line, filename):
S375
"""
if pep8.noqa(logical_line):
if pycodestyle.noqa(logical_line):
return
if (RE_USE_JSONUTILS_INVALID_LINE.match(logical_line) and
not RE_USE_JSONUTILS_VALID_LINE.match(logical_line)):

View File

@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
hacking>=1.1.0 # Apache-2.0
PyMySQL>=0.7.6 # MIT License
bandit>=1.1.0 # Apache-2.0

View File

@ -128,6 +128,12 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools
# [H204] Use assert(Not)Equal to check for equality
# [H205] Use assert(Greater|Less)(Equal) for comparison
enable-extensions=H904,H106,H203,H204,H205
# [E123] Closing bracket does not match indentation of opening bracket's line
# [E226] Missing whitespace around arithmetic operator
# [E402] Module level import not at top of file
# [E731] Do not assign a lambda expression, use a def
# [W503] Line break occurred before a binary operator
ignore=E123,E226,E402,E731,W503
[hacking]
import_exceptions = sahara.i18n