Commit c3f4fac4 authored by payno's avatar payno
Browse files

fix CI

parent 487f9de2
Pipeline #13807 passed with stage
in 2 minutes and 35 seconds
......@@ -17,17 +17,17 @@ variables:
- python --version
- python -m pip install pip --upgrade
- python -m pip install setuptools --upgrade
- git submodule init
- git submodule update
script:
- python -m pip install -r requirements.txt
- cd xas
- git submodule add https://gitlab.esrf.fr/workflow/representation.git
- cd -
- python -m pip install -e .
- python -m unittest -v representationtest.test.suite
test:python3.7-buster:
image: python:3.7-buster
test:python3.5-strectch:
image: python:3.5-stretch
<<: *test_linux_template
......@@ -43,15 +43,16 @@ test:python3.7-buster:
- python -m pip install setuptools --upgrade
- source ./ci/install_scripts.sh
- install_xas xas_workflow_instanciation_add_on
- git submodule init
- git submodule update
script:
- python -m pip install -r requirements.txt
- cd xas
- git submodule add https://gitlab.esrf.fr/workflow/representation.git
- cd -
- python -m pip install -e .
- ls representationtest
- ls representationtest/representation
- python -m unittest -v representationtest.test.suite
test:python3.5-stretch-xas-pymca:
image: python:3.5-stretch
test:python3.7-buster-xas-pymca:
image: docker-registry.esrf.fr/dau/x11:python3.7_buster
<<: *test_linux_xas_template
......@@ -2,13 +2,12 @@
function install_xas(){
unset http_proxy
unset https_proxy
git clone https://gitlab.esrf.fr/workflow/xas.git --single-branch --branch $2
git clone https://gitlab.esrf.fr/workflow/xas.git --single-branch --branch $1
cd xas
pip install -r requirements.txt
pip install pymca
pip install .
export http_proxy=http://proxy.esrf.fr:3128/
export https_proxy=http://proxy.esrf.fr:3128/
cd -1
cd ..
}
......@@ -90,9 +90,9 @@ def get_version():
def get_readme():
"""Returns content of README.md file"""
"""Returns content of README.rst file"""
dirname = os.path.dirname(os.path.abspath(__file__))
filename = os.path.join(dirname, "README.md")
filename = os.path.join(dirname, "README.rst")
with io.open(filename, "r", encoding="utf-8") as fp:
long_description = fp.read()
return long_description
......
Supports Markdown
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