diff --git a/.ci/requirements.txt b/.ci/requirements.txt index 68f87ede2c4d88bda62eb7e73f5ad255d91d7ec4..224b705e194be46f595e954b7cb4744903c47d03 100644 --- a/.ci/requirements.txt +++ b/.ci/requirements.txt @@ -1,6 +1,8 @@ coverage==4.2 flake8==3.2.1 +future==0.16.0 mock==2.0.0 nose==1.3.7 pyflakes==1.3.0 +six==1.10.0 xunitparser==1.3.3 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e385cd8caf1b9e4d2ad69bb9d1d345e484be8da..c084671a2e394d3f6c85a865c182438e88ca1db1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,27 +1,57 @@ -image: "python:2.7" - -before_script: - - "pip install -r .ci/requirements.txt" - - "REQUIREMENTS=$(mktemp) && python setup.py requirements > ${REQUIREMENTS} && pip install -r ${REQUIREMENTS} && rm ${REQUIREMENTS}" - - "pip install -r .ci/requirements_modules.txt" - -build: - stage: "build" - script: - - "./tools/local_install.sh ~/bin" - -lint: - stage: "test" - script: - - "./tools/pyflakes.sh" - - "./tools/weboob_lint.sh" - -unittests: - stage: "test" - script: - - "./tools/run_tests.sh" - -doc: - stage: "deploy" - script: - - "cd ./docs && make html" +test:2.7: + image: "python:2.7" + + before_script: + - "pip install -r .ci/requirements.txt" + - "REQUIREMENTS=$(mktemp) && python setup.py requirements > ${REQUIREMENTS} && pip install -r ${REQUIREMENTS} && rm ${REQUIREMENTS}" + - "pip install -r .ci/requirements_modules.txt" + + build: + stage: "build" + script: + - "./tools/local_install.sh ~/bin" + + lint: + stage: "test" + script: + - "./tools/pyflakes.sh" + - "./tools/weboob_lint.sh" + + unittests: + stage: "test" + script: + - "./tools/run_tests.sh" + + doc: + stage: "deploy" + script: + - "cd ./docs && make html" + +test:3: + image: "python:3" + + before_script: + - "pip install -r .ci/requirements.txt" + - "REQUIREMENTS=$(mktemp) && python setup.py requirements > ${REQUIREMENTS} && pip install -r ${REQUIREMENTS} && rm ${REQUIREMENTS}" + - "pip install -r .ci/requirements_modules.txt" + + build: + stage: "build" + script: + - "./tools/local_install.sh ~/bin" + + lint: + stage: "test" + script: + - "./tools/pyflakes.sh" + - "./tools/weboob_lint.sh" + + unittests: + stage: "test" + script: + - "./tools/run_tests.sh -3" + + doc: + stage: "deploy" + script: + - "cd ./docs && make html"