diff --git a/.arclint b/.arclint index f98064824..50876d186 100644 --- a/.arclint +++ b/.arclint @@ -1,19 +1,23 @@ { "linters": { "format": { "type": "clang-format", "include": [ "(\\.cc$)", "(\\.hh$)" ], "exclude": "(^third-party/)" }, "python": { - "type": "pyflakes", - "bin": "pyflakes3", + "type": "flake8", "include": [ "(\\.py$)" ], - "exclude": "(^third-party/)" + "exclude": "(^third-party/)", + "severity.rules": { + "(^E)": "error", + "(^W)": "warning", + "(^F)": "advice" + } }, "merges": { "type": "merge-conflict" } } } diff --git a/test/ci/Dockerfile b/test/ci/Dockerfile index 8cae608bb..3b663cf1f 100644 --- a/test/ci/Dockerfile +++ b/test/ci/Dockerfile @@ -1,16 +1,16 @@ FROM debian:testing MAINTAINER Nicolas Richart # Make sure the package repository is up to date. RUN apt-get -qq update && apt-get -qq -y install \ g++ gfortran cmake \ libmumps-seq-dev libscotch-dev \ libboost-dev libopenblas-dev \ python3 python3-dev \ python3-numpy python3-scipy python3-mpi4py\ python3-phabricator python3-click python3-yaml \ - swig3.0 gmsh curl \ + swig3.0 gmsh curl flake8 \ git arcanist clang-format xsltproc jq \ && rm -rf /var/lib/apt/lists/* # apt-get on one line due to https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run diff --git a/test/ci/scripts/harbomaster/__init__.py b/test/ci/scripts/harbomaster/__init__.py index b88afb730..9d8de9186 100644 --- a/test/ci/scripts/harbomaster/__init__.py +++ b/test/ci/scripts/harbomaster/__init__.py @@ -1,26 +1,26 @@ # for the module import sys as __hbm_sys def export(definition): """ Decorator to export definitions from sub-modules to the top-level package :param definition: definition to be exported :return: definition """ __module = __hbm_sys.modules[definition.__module__] __pkg = __hbm_sys.modules[__module.__package__] __pkg.__dict__[definition.__name__] = definition if '__all__' not in __pkg.__dict__: __pkg.__dict__['__all__'] = [] __pkg.__all__.append(definition.__name__) return definition -from . import ctestresults -from . import arclint +from . import ctestresults +from . import arclint from . import hbm