Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
payno
id06workflow
Commits
3d81f226
Commit
3d81f226
authored
Mar 04, 2019
by
payno
Browse files
Merge branch 'fix_ci' into 'master'
Fix ci See merge request
!13
parents
4818fb59
f7e7df4b
Pipeline
#13461
failed with stage
in 1 minute and 49 seconds
Changes
2
Pipelines
24
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
3d81f226
...
...
@@ -13,30 +13,31 @@ test:python3.5-stretch-pyqt5:
-
python -m pip install setuptools --upgrade
-
python -m pip install numpy --upgrade
-
python -m pip install matplotlib
-
python -m pip install Orange3
-
python -m pip install Orange3
==3.19.0
-
python -m pip install -r requirements.txt
-
python -m pip install .
-
/usr/bin/xvfb-run --server-args="-screen 0 1024x768x24" -a id06workflow test -v
test:test-notebooks:
type
:
test
image
:
docker-registry.esrf.fr/dau/tomwer:python3.5_stretch_pyqt5
script
:
-
arch
-
export PYTHONPATH="${PYTHONPATH}:/usr/lib/python3/dist-packages/"
-
export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/:${LD_LIBRARY_PATH}
-
export http_proxy=http://proxy.esrf.fr:3128/
-
export https_proxy=http://proxy.esrf.fr:3128/
-
python --version
-
python -m pip install pip --upgrade
-
python -m pip install setuptools --upgrade
-
python -m pip install numpy --upgrade
-
python -m pip install matplotlib
-
python -m pip install jupyter_client
-
python -m pip install nbconvert
-
python -m pip install -r requirements.txt
-
python -m pip install .
-
python -m pip install ipykernel
-
python -m ipykernel install --user
-
jupyter nbconvert --to notebook --execute doc/tutorials/id06workflow_operations.ipynb
# TODO: set back unit test with some dataset register in edna-site
#
#test:test-notebooks:
# type: test
# image: docker-registry.esrf.fr/dau/tomwer:python3.5_stretch_pyqt5
# script:
# - arch
# - export PYTHONPATH="${PYTHONPATH}:/usr/lib/python3/dist-packages/"
# - export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/:${LD_LIBRARY_PATH}
# - export http_proxy=http://proxy.esrf.fr:3128/
# - export https_proxy=http://proxy.esrf.fr:3128/
# - python --version
# - python -m pip install pip --upgrade
# - python -m pip install setuptools --upgrade
# - python -m pip install numpy --upgrade
# - python -m pip install matplotlib
# - python -m pip install jupyter_client
# - python -m pip install nbconvert
# - python -m pip install -r requirements.txt
# - python -m pip install .
# - python -m pip install ipykernel
# - python -m ipykernel install --user
# - jupyter nbconvert --to notebook --execute doc/tutorials/id06workflow_operations.ipynb
id06workflow/resources/__init__.py
View file @
3d81f226
...
...
@@ -68,7 +68,7 @@ import logging
import
tempfile
import
unittest
import
importlib
from
silx.third_party
import
six
import
six
logger
=
logging
.
getLogger
(
__name__
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment