[CI] add flake8 test

.gitlab-ci.yml

@@ -16,10 +16,10 @@ check_style:
   stage: style
   image: docker-registry.esrf.fr/dau/est:python3.7_stretch_pyqt5_gtk3_wxpython
   before_script:
-    - pip install black flake8
+    - pip install flake8
   script:
-    - LC_ALL=C.UTF-8 black --check --safe .
-    - flake8
+    - flake8 est
+    - flake8 orangecontrib
 
 
 # build
@@ -52,7 +52,6 @@ doc:
   only:
     - master
 
-
 # test
 .build_template: &test_linux_template_pymca
   stage: test
@@ -145,6 +144,30 @@ test:python3.7-stretch-pyqt5_pymca_larch:
   image: docker-registry.esrf.fr/dau/est:python3.7_stretch_pyqt5_gtk3_wxpython
   <<: *test_linux_template_pymca_larch
 
+check_lint:
+  stage: test
+  image: docker-registry.esrf.fr/dau/ewoks:python_3.8
+  tags:
+    - linux
+  before_script:
+    - arch
+    - which python
+    - python --version
+    - python -m pip install pip --upgrade
+    - python -m pip install setuptools --upgrade
+    - python -m pip install flake8
+  script:
+    - python setup.py build
+    - python -m pip install .[doc]
+    - python setup.py build_sphinx
+    - mv build/sphinx/html artifacts/doc
+  artifacts:
+    paths:
+      - artifacts/doc/
+    when: on_success
+    expire_in: 2h
+  only:
+    - master
 
 test:test-est-tutorials_pymca:
   image: docker-registry.esrf.fr/dau/est:python3.7_stretch_pyqt5_gtk3_wxpython

est/core/process/larch/autobk.py

@@ -28,8 +28,6 @@ from est.core.types import Spectrum, XASObject
 from est.core.process.process import Process
 from est.core.process.process import _NexusDatasetDef
 from larch.xafs.autobk import autobk
-import multiprocessing
-import functools
 import logging
 
 _logger = logging.getLogger(__name__)

est/core/process/larch/mback.py

@@ -28,8 +28,6 @@ from est.core.types import Spectrum, XASObject
 from est.core.process.process import Process
 from est.core.process.process import _NexusDatasetDef
 from larch.xafs.mback import mback
-import multiprocessing
-import functools
 import logging
 
 _logger = logging.getLogger(__name__)

est/core/process/larch/mback_norm.py

@@ -29,8 +29,6 @@ from est.core.process.process import Process
 from est.core.process.process import _NexusDatasetDef
 from larch.xafs.mback import mback_norm
 from larch.xafs.pre_edge import preedge
-import multiprocessing
-import functools
 import logging
 
 _logger = logging.getLogger(__name__)

est/core/process/larch/pre_edge.py

@@ -29,8 +29,6 @@ from est.core.process.process import Process
 from est.core.process.process import _NexusSpectrumDef, _NexusDatasetDef
 from est.core.utils.symbol import MU_CHAR
 from larch.xafs.pre_edge import pre_edge
-import multiprocessing
-import functools
 import logging
 
 _logger = logging.getLogger(__name__)

est/core/process/larch/xftf.py

@@ -30,8 +30,6 @@ from est.core.process.process import _NexusSpectrumDef
 from est.core.process.process import _NexusDatasetDef
 from larch.xafs.xafsft import xftf
 from est.core.utils.symbol import ANGSTROM_CHAR
-import multiprocessing
-import functools
 import logging
 import numpy
 

est/core/process/pymca/exafs.py

@@ -28,10 +28,7 @@ __authors__ = ["H. Payno"]
 __license__ = "MIT"
 __date__ = "04/10/2021"
 
-import functools
 import logging
-import multiprocessing
-
 import numpy
 from PyMca5.PyMcaPhysics.xas.XASClass import XASClass
 from PyMca5.PyMcaPhysics.xas.XASClass import e2k, k2e

est/core/process/pymca/ft.py

@@ -28,10 +28,7 @@ __authors__ = ["H. Payno"]
 __license__ = "MIT"
 __date__ = "05/10/2021"
 
-import functools
 import logging
-import multiprocessing
-
 import numpy
 from PyMca5.PyMcaPhysics.xas.XASClass import XASClass
 from est.core.process.process import Process

est/core/process/pymca/k_weight.py

@@ -28,9 +28,7 @@ __authors__ = ["H. Payno"]
 __license__ = "MIT"
 __date__ = "05/10/2021"
 
-import functools
 import logging
-import multiprocessing
 from PyMca5.PyMcaPhysics.xas.XASClass import XASClass, e2k
 from est.core.process.process import Process
 from est.core.process.pymca.exafs import process_spectr_exafs

est/core/process/pymca/normalization.py

@@ -29,9 +29,7 @@ __license__ = "MIT"
 __date__ = "05/10/2021"
 
 
-import functools
 import logging
-import multiprocessing
 from PyMca5.PyMcaPhysics.xas.XASClass import XASClass
 from est.core.process.process import Process
 from est.core.process.process import _NexusDatasetDef

orangecontrib/est/process.py

@@ -28,8 +28,6 @@ __license__ = "MIT"
 __date__ = "06/07/2019"
 
 
-from silx.gui import qt
-from Orange.widgets import gui
 import logging
 from ewoksorange.bindings.owwidgets import OWEwoksWidgetOneThread
 from ewokscore.hashing import MissingData

orangecontrib/est/progress.py

-# coding: utf-8
-# /*##########################################################################
-#
-# Copyright (c) 2016-2017 European Synchrotron Radiation Facility
-#
-# 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.
-#
-# ###########################################################################*/
-
-__authors__ = ["H. Payno"]
-__license__ = "MIT"
-__date__ = "07/08/2019"
-
-
-from silx.gui import qt
-
-from est.core.process.progress import Progress
-
-
-class QProgress(Progress, qt.QObject):
-    sigProgress = qt.Signal(int)
-
-    def __init__(self, name):
-        assert name is not None
-        qt.QObject.__init__(self)
-        Progress.__init__(self, name)
-
-    def startProcess(self):
-        self.sigProgress.emit(0)
-
-    def setAdvancement(self, value):
-        self.sigProgress.emit(value)
-
-    def endProcess(self):
-        self.sigProgress.emit(100)

orangecontrib/est/widgets/larch/autobk.py

@@ -28,18 +28,13 @@ __license__ = "MIT"
 __date__ = "04/10/2021"
 
 
-import functools
 import logging
 from Orange.widgets import gui
 from Orange.widgets.settings import Setting
-from Orange.widgets.widget import OWWidget
-from Orange.widgets.widget import Input, Output
-import Orange.data
 from silx.gui import qt
 from silx.gui.plot import LegendSelector
 import est.core.process.larch.autobk
 from orangecontrib.est.process import _ProcessForOrangeMixIn
-from est.core.types import XASObject
 from est.gui.XasObjectViewer import XasObjectViewer, ViewType
 from est.gui.XasObjectViewer import (
     _plot_bkg,
@@ -48,8 +43,6 @@ from est.gui.XasObjectViewer import (
     _plot_chi,
 )
 from est.gui.larch.autobk import _AutobkParameters
-from orangecontrib.est.progress import QProgress
-from orangecontrib.est.utils import Converter
 from orangecontrib.est.widgets.container import _ParameterWindowContainer
 
 _logger = logging.getLogger(__file__)

orangecontrib/est/widgets/larch/mback.py

@@ -28,23 +28,17 @@ __license__ = "MIT"
 __date__ = "06/07/2019"
 
 
-import functools
 import logging
 from Orange.widgets import gui
 from Orange.widgets.settings import Setting
-from Orange.widgets.widget import OWWidget
-from Orange.widgets.widget import Input, Output
-import Orange.data
 from silx.gui import qt
 from silx.gui.plot import LegendSelector
 import est.core.process.larch.mback
 from orangecontrib.est.process import _ProcessForOrangeMixIn
-from est.core.types import XASObject
 from est.gui.XasObjectViewer import XasObjectViewer, ViewType
 from est.gui.larch.mback import _MBackParameters
-from orangecontrib.est.progress import QProgress
+
 from est.gui.XasObjectViewer import _plot_norm, _plot_raw, _plot_fpp, _plot_f2
-from orangecontrib.est.utils import Converter
 from orangecontrib.est.widgets.container import _ParameterWindowContainer
 
 _logger = logging.getLogger(__file__)

orangecontrib/est/widgets/larch/mback_norm.py

@@ -28,23 +28,18 @@ __license__ = "MIT"
 __date__ = "06/07/2019"
 
 
-import functools
 import logging
 from Orange.widgets import gui
 from Orange.widgets.settings import Setting
 from Orange.widgets.widget import OWWidget
-from Orange.widgets.widget import Input, Output
-import Orange.data
 from silx.gui import qt
 from silx.gui.plot import LegendSelector
 import est.core.process.larch.mback_norm
 from orangecontrib.est.process import _ProcessForOrangeMixIn
-from est.core.types import XASObject
 from est.gui.XasObjectViewer import XasObjectViewer, ViewType
 from est.gui.XasObjectViewer import _plot_norm, _plot_mback_mu
 from est.gui.larch.mback import _MBackParameters
-from orangecontrib.est.progress import QProgress
-from orangecontrib.est.utils import Converter
+
 from orangecontrib.est.widgets.container import _ParameterWindowContainer
 
 _logger = logging.getLogger(__file__)

orangecontrib/est/widgets/larch/pre_edge.py

@@ -28,18 +28,13 @@ __license__ = "MIT"
 __date__ = "06/07/2019"
 
 
-import functools
 import logging
 from Orange.widgets import gui
 from Orange.widgets.settings import Setting
-from Orange.widgets.widget import OWWidget
-from Orange.widgets.widget import Input, Output
-import Orange.data
 from silx.gui import qt
 from silx.gui.plot import LegendSelector
 import est.core.process.larch.pre_edge
 from orangecontrib.est.process import _ProcessForOrangeMixIn
-from est.core.types import XASObject
 from est.gui.XasObjectViewer import XasObjectViewer, ViewType
 from est.gui.XasObjectViewer import (
     _plot_raw,
@@ -50,8 +45,7 @@ from est.gui.XasObjectViewer import (
     _plot_pre_edge,
 )
 from est.gui.larch.pre_edge import _MPreEdgeParameters
-from orangecontrib.est.progress import QProgress
-from orangecontrib.est.utils import Converter
+
 from orangecontrib.est.widgets.container import _ParameterWindowContainer
 
 _logger = logging.getLogger(__file__)

orangecontrib/est/widgets/larch/xftf.py

@@ -28,18 +28,13 @@ __license__ = "MIT"
 __date__ = "06/07/2019"
 
 
-import functools
 import logging
 from Orange.widgets import gui
 from Orange.widgets.settings import Setting
-from Orange.widgets.widget import OWWidget
-from Orange.widgets.widget import Input, Output
-import Orange.data
 from silx.gui import qt
 from silx.gui.plot import LegendSelector
 import est.core.process.larch.xftf
 from orangecontrib.est.process import _ProcessForOrangeMixIn
-from est.core.types import XASObject
 from est.gui.XasObjectViewer import (
     XasObjectViewer,
     ViewType,
@@ -49,8 +44,7 @@ from est.gui.XasObjectViewer import (
     _plot_masked_chi_weighted_k,
 )
 from est.gui.larch.xftf import _MXFTFParameters
-from orangecontrib.est.progress import QProgress
-from orangecontrib.est.utils import Converter
+
 from orangecontrib.est.widgets.container import _ParameterWindowContainer
 
 _logger = logging.getLogger(__file__)

orangecontrib/est/widgets/pymca/exafs.py

@@ -28,15 +28,10 @@ __license__ = "MIT"
 __date__ = "06/07/2019"
 
 
-import functools
 import logging
 
 from Orange.widgets import gui
 from Orange.widgets.settings import Setting
-from Orange.widgets.widget import OWWidget
-from Orange.widgets.widget import Input, Output
-import Orange.data
-from est.core.types import XASObject
 from PyMca5.PyMcaGui.physics.xas.XASPostEdgeParameters import XASPostEdgeParameters
 from silx.gui import qt
 from silx.gui.plot import LegendSelector
@@ -48,8 +43,7 @@ from est.gui.XasObjectViewer import (
     _exafs_postedge_plot,
     _exafs_knots_plot,
 )
-from orangecontrib.est.progress import QProgress
-from orangecontrib.est.utils import Converter
+
 from orangecontrib.est.widgets.container import _ParameterWindowContainer
 
 

orangecontrib/est/widgets/pymca/ft.py

@@ -28,14 +28,10 @@ __license__ = "MIT"
 __date__ = "06/07/2019"
 
 
-import functools
 import logging
 
 from Orange.widgets import gui
 from Orange.widgets.settings import Setting
-from Orange.widgets.widget import OWWidget
-from Orange.widgets.widget import Input, Output
-import Orange.data
 from PyMca5.PyMcaGui.physics.xas.XASFourierTransformParameters import (
     XASFourierTransformParameters,
 )
@@ -44,13 +40,11 @@ from silx.gui.plot import LegendSelector
 
 import est.core.process.pymca.ft
 from orangecontrib.est.process import _ProcessForOrangeMixIn
-from est.core.types import XASObject
 from est.gui.XasObjectViewer import XasObjectViewer, ViewType
 from est.gui.XasObjectViewer import _normalized_exafs, _ft_window_plot
 from est.gui.XasObjectViewer import _ft_intensity_plot, _ft_imaginary_plot
 
-from orangecontrib.est.progress import QProgress
-from orangecontrib.est.utils import Converter
+
 from orangecontrib.est.widgets.container import _ParameterWindowContainer
 
 _logger = logging.getLogger(__file__)

orangecontrib/est/widgets/pymca/k_weight.py

@@ -27,20 +27,14 @@ __authors__ = ["H. Payno"]
 __license__ = "MIT"
 __date__ = "06/07/2019"
 
-import functools
 import logging
 
 from Orange.widgets import gui
 from Orange.widgets.settings import Setting
-from Orange.widgets.widget import OWWidget
-from Orange.widgets.widget import Input, Output
-import Orange.data
 from silx.gui import qt
 import est.core.process.pymca.k_weight
 from orangecontrib.est.process import _ProcessForOrangeMixIn
-from est.core.types import XASObject
-from orangecontrib.est.progress import QProgress
-from orangecontrib.est.utils import Converter
+
 
 _logger = logging.getLogger(__file__)