diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00ab79ce6221a89665c25e9a6c601109549c060c..e4b181abd856206398700c6285174ee4dd3316ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,6 @@ variables: # Definition of our build pipeline order stages: - build - - docker - deploy - pypi @@ -63,23 +62,6 @@ stages: key: "macosx-cache" -# Docker host based testing (must be run inside dind or docker-enabled host) -.docker_test_linux_template: &linux_docker_job - stage: docker - before_script: - # safe keep artifacts as before_build.sh will erase those... - - mv ${CONDA_ROOT}/conda-bld . - - ./_ci/install.sh _ci master #updates ci support scripts - - ./_ci/before_build.sh - - mv conda-bld ${CONDA_ROOT} - - ./scripts/before_test.sh - script: - - export BEAT_DOCKER_TESTS=true - - BOB_TEST_ONLY=true ./_ci/build.sh - after_script: - - ./_ci/after_build.sh - - build_linux_36: <<: *linux_build_job variables: @@ -100,17 +82,6 @@ build_macosx_36: PYTHON_VERSION: "3.6" -# Docker host based testing -docker_linux_36: - <<: *linux_docker_job - variables: - PYTHON_VERSION: "3.6" - dependencies: - - build_linux_36 - tags: - - docker-build - - # Deploy targets .deploy_template: &deploy_job stage: deploy diff --git a/conda/meta.yaml b/conda/meta.yaml index ca26dc15de766e1d68350bf41ba0088e7e3565d3..41dad405f83681d76cbc4ce1475a0df4de8774b9 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -53,10 +53,9 @@ test: commands: - worker --help - - if [ -n "${BEAT_DOCKER_TESTS}" ]; then nosetests --with-coverage --cover-package={{ name }} -sv {{ name }}; fi - - if [ -z "${BEAT_DOCKER_TESTS}" ]; then nosetests --with-coverage --cover-package={{ name }} -sv {{ name }} --exclude=".*test_docker.*"; fi - - if [ -z "${BEAT_DOCKER_TESTS}" ]; then sphinx-build -aEW {{ project_dir }}/doc {{ project_dir }}/sphinx; fi - - if [ -z "${BEAT_DOCKER_TESTS}" ]; then sphinx-build -aEb doctest {{ project_dir }}/doc sphinx; fi + - nosetests --with-coverage --cover-package={{ name }} -sv {{ name }} + - sphinx-build -aEW {{ project_dir }}/doc {{ project_dir }}/sphinx + - sphinx-build -aEb doctest {{ project_dir }}/doc sphinx - conda inspect linkages -p $PREFIX {{ name }} # [not win] - conda inspect objects -p $PREFIX {{ name }} # [osx]