Commit f28dd5e1 authored by payno's avatar payno

[fix] import directly six instead of passing by the silx.third_party

parent 1f3574cc
Pipeline #8889 failed with stage
in 5 minutes and 2 seconds
test:debian.9-python3.6-silx0.8-PyQt5-freeartmaster:
test:debian.9-python3.5-silx0.8-PyQt5-freeartmaster:
type: test
image: docker-registry.esrf.fr/dau/opengl:python3.5-stretch
image: docker-registry.esrf.fr/dau/tomwer:python3.5_stretch_pyqt5
script:
- export http_proxy=http://proxy.esrf.fr:3128/
- export https_proxy=http://proxy.esrf.fr:3128/
......@@ -10,7 +10,7 @@ test:debian.9-python3.6-silx0.8-PyQt5-freeartmaster:
- python -m pip install pip --upgrade
- python -m pip install setuptools --upgrade
- pip install numpy --upgrade
- python -m pip install PyQt5
- python -m pip install PyQt5 --upgrade
- python -m pip install matplotlib
- python -m pip install -r requirements.txt --upgrade
- source ./ci/tomogui_install.sh
......@@ -20,9 +20,9 @@ test:debian.9-python3.6-silx0.8-PyQt5-freeartmaster:
- xvfb-run --server-args="-screen 0 1024x768x24" -a tomogui test -v
test:debian.9-python3.6-silx0.8-PyQt5-freeart3.3.0:
test:debian.9-python3.5-silx0.8-PyQt5-freeart3.3.0:
type: test
image: docker-registry.esrf.fr/dau/opengl:python3.5-stretch
image: docker-registry.esrf.fr/dau/tomwer:python3.5_stretch_pyqt5
script:
- export http_proxy=http://proxy.esrf.fr:3128/
- export https_proxy=http://proxy.esrf.fr:3128/
......@@ -30,7 +30,7 @@ test:debian.9-python3.6-silx0.8-PyQt5-freeart3.3.0:
- python -m pip install pip --upgrade
- python -m pip install setuptools --upgrade
- pip install numpy --upgrade
- python -m pip install PyQt5
- python -m pip install PyQt5 --upgrade
- python -m pip install matplotlib
- python -m pip install -r requirements.txt --upgrade
- source ./ci/tomogui_install.sh
......
......@@ -40,7 +40,7 @@ import silx.io.url
from silx.gui import qt
from silx.gui.hdf5.Hdf5TreeModel import Hdf5TreeModel
from . import utils
from silx.third_party import six
import six
from .FileTypeComboBox import FileTypeComboBox
try:
import fabio
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment