Commit 2256806b authored by André Anjos's avatar André Anjos 💬
Browse files

Merge branch 'enable-py37' into 'master'

Enable py37

See merge request !103
parents 6c49a259 9cf135a8
Pipeline #32962 passed with stages
in 10 minutes and 21 seconds
......@@ -12,57 +12,54 @@ stages:
# Build targets
.build_template: &build_job
.build_template:
stage: build
script:
- python3 ./bob/devtools/bootstrap.py -vv build
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
- conda activate base
- python3 ./bob/devtools/build.py -vv
cache: &build_caches
artifacts:
expire_in: 1 week
cache:
paths:
- miniconda.sh
- ${CONDA_ROOT}/pkgs/*.tar.bz2
- ${CONDA_ROOT}/pkgs/urls.txt
.build_linux_template: &linux_build_job
<<: *build_job
.build_linux_template:
extends: .build_template
tags:
- docker
image: continuumio/conda-concourse-ci
artifacts:
expire_in: 1 week
paths:
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
- ${CONDA_ROOT}/conda-bld/noarch/*.tar.bz2
cache:
<<: *build_caches
key: "linux-cache"
.build_macosx_template: &macosx_build_job
<<: *build_job
.build_macosx_template:
extends: .build_template
tags:
- macosx
artifacts:
expire_in: 1 week
paths:
- ${CONDA_ROOT}/conda-bld/osx-64/*.tar.bz2
- ${CONDA_ROOT}/conda-bld/noarch/*.tar.bz2
cache:
<<: *build_caches
key: "macosx-cache"
build_linux_36:
<<: *linux_build_job
extends: .build_linux_template
variables:
PYTHON_VERSION: "3.6"
build_linux_37:
<<: *linux_build_job
extends: .build_linux_template
variables:
PYTHON_VERSION: "3.7"
BUILD_EGG: "true"
......@@ -72,28 +69,26 @@ build_linux_37:
- conda activate base
- python3 ./bob/devtools/build.py -vv --twine-check
artifacts:
expire_in: 1 week
paths:
- dist/*.zip
- sphinx
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
- ${CONDA_ROOT}/conda-bld/noarch/*.tar.bz2
build_macosx_36:
<<: *macosx_build_job
extends: .build_macosx_template
variables:
PYTHON_VERSION: "3.6"
build_macosx_37:
<<: *macosx_build_job
extends: .build_macosx_template
variables:
PYTHON_VERSION: "3.7"
# Deploy targets
.deploy_template: &deploy_job
.deploy_template:
stage: deploy
script:
- python3 ./bob/devtools/bootstrap.py -vv local base
......@@ -109,7 +104,7 @@ build_macosx_37:
- build_macosx_37
tags:
- docker
cache: &build_caches
cache:
paths:
- miniconda.sh
- ${CONDA_ROOT}/pkgs/*.tar.bz2
......@@ -117,14 +112,14 @@ build_macosx_37:
deploy_beta:
<<: *deploy_job
extends: .deploy_template
environment: beta
only:
- master
deploy_stable:
<<: *deploy_job
extends: .deploy_template
environment: stable
only:
- /^v\d+\.\d+\.\d+([abc]\d*)?$/ # PEP-440 compliant version (tags)
......@@ -152,7 +147,7 @@ pypi:
- build_macosx_37
tags:
- docker
cache: &build_caches
cache:
paths:
- miniconda.sh
- ${CONDA_ROOT}/pkgs/*.tar.bz2
......
......@@ -15,7 +15,7 @@ stages:
# Build targets
.build_template: &build_job
.build_template:
stage: build
script:
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
......@@ -27,7 +27,7 @@ stages:
- bdt ci base-build -vv --python=3.7 python.txt
- '[ "${CI_COMMIT_REF_NAME}" = "master" ] && bdt ci base-deploy -vv'
- bdt ci clean -vv
cache: &build_caches
cache:
paths:
- miniconda.sh
- ${CONDA_ROOT}/pkgs/*.tar.bz2
......@@ -35,19 +35,17 @@ stages:
build_linux:
<<: *build_job
extends: .build_template
tags:
- docker
image: continuumio/conda-concourse-ci
cache:
<<: *build_caches
key: "linux-cache"
build_macosx:
<<: *build_job
extends: .build_template
tags:
- macosx
cache:
<<: *build_caches
key: "macosx-cache"
build_linux_36:
tags:
- docker-build
build_linux_37:
tags:
- docker-build
......@@ -47,11 +47,11 @@ stages:
key: "linux-cache"
build_linux_36:
build_linux_37:
<<: *linux_build_job
variables:
GITLAB_CHECKOUT_STRATEGY: "https://gitlab-ci-token:${CI_BUILD_TOKEN}@gitlab.idiap.ch/"
PYTHON_VERSION: "3.6"
PYTHON_VERSION: "3.7"
BUILD_EGG: "true"
artifacts:
expire_in: 1 week
......@@ -71,7 +71,7 @@ build_linux_36:
- bdt ci deploy -vv
- bdt ci clean -vv
dependencies:
- build_linux_36
- build_linux_37
tags:
- docker
cache: &build_caches
......
......@@ -19,7 +19,6 @@ stages:
stage: build
variables:
CONDA_ROOT: "${CI_PROJECT_DIR}/miniconda"
PYTHON_VERSION: "3.6"
PYTHONUNBUFFERED: 1
script:
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
......@@ -35,13 +34,31 @@ stages:
- ${CONDA_ROOT}/pkgs/*.tar.bz2
- ${CONDA_ROOT}/pkgs/urls.txt
linux:
build_linux_36:
extends: .build_template
variables:
PYTHON_VERSION: "3.6"
tags:
- docker
macosx:
build_linux_37:
extends: .build_template
variables:
PYTHON_VERSION: "3.7"
tags:
- docker
build_macosx_36:
extends: .build_template
variables:
PYTHON_VERSION: "3.6"
tags:
- macosx
build_macosx_37:
extends: .build_template
variables:
PYTHON_VERSION: "3.6"
tags:
- macosx
......@@ -58,7 +75,7 @@ macosx:
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
- conda activate base
- bdt ci clean-betas -vv
cache: &test_caches
cache:
key: "linux-cache"
paths:
- miniconda.sh
......
......@@ -17,7 +17,7 @@ stages:
# Build targets
.build_template: &build_job
.build_template:
stage: build
script:
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
......@@ -26,44 +26,57 @@ stages:
- conda activate base
- bdt ci build -vv
- bdt ci clean -vv
cache: &build_caches
artifacts:
expire_in: 1 week
cache:
paths:
- miniconda.sh
- ${CONDA_ROOT}/pkgs/*.tar.bz2
- ${CONDA_ROOT}/pkgs/urls.txt
.build_linux_template: &linux_build_job
<<: *build_job
.build_linux_template:
extends: .build_template
tags:
- docker
image: continuumio/conda-concourse-ci
artifacts:
expire_in: 1 week
paths:
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
cache:
<<: *build_caches
key: "linux-cache"
.build_macosx_template: &macosx_build_job
<<: *build_job
.build_macosx_template:
extends: .build_template
tags:
- macosx
artifacts:
expire_in: 1 week
paths:
- ${CONDA_ROOT}/conda-bld/osx-64/*.tar.bz2
cache:
<<: *build_caches
key: "macosx-cache"
build_macosx_36:
extends: .build_macosx_template
variables:
PYTHON_VERSION: "3.6"
build_macosx_37:
extends: .build_macosx_template
variables:
PYTHON_VERSION: "3.7"
build_linux_36:
<<: *linux_build_job
extends: .build_linux_template
variables:
PYTHON_VERSION: "3.6"
build_linux_37:
extends: .build_linux_template
variables:
PYTHON_VERSION: "3.7"
BUILD_EGG: "true"
script:
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
......@@ -74,21 +87,14 @@ build_linux_36:
- bdt ci readme -vv dist/*.zip
- bdt ci clean -vv
artifacts:
expire_in: 1 week
paths:
- dist/*.zip
- sphinx
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
build_macosx_36:
<<: *macosx_build_job
variables:
PYTHON_VERSION: "3.6"
# Test targets (not normally used)
.test_template: &test_job
.test_template:
stage: test
script:
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
......@@ -97,34 +103,32 @@ build_macosx_36:
- conda activate base
- bdt ci test -vv
- bdt ci clean -vv
cache: &test_caches
cache:
paths:
- miniconda.sh
- ${CONDA_ROOT}/pkgs/*.tar.bz2
- ${CONDA_ROOT}/pkgs/urls.txt
.test_linux_template: &linux_test_job
<<: *test_job
.test_linux_template:
extends: .test_template
tags:
- docker
image: continuumio/conda-concourse-ci
cache:
<<: *test_caches
key: "linux-cache"
.test_macosx_template: &macosx_test_job
<<: *test_job
.test_macosx_template:
extends: .test_template
tags:
- macosx
cache:
<<: *test_caches
key: "macosx-cache"
# Deploy targets
.deploy_template: &deploy_job
.deploy_template:
stage: deploy
script:
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
......@@ -136,9 +140,11 @@ build_macosx_36:
dependencies:
- build_linux_36
- build_macosx_36
- build_linux_37
- build_macosx_37
tags:
- docker
cache: &build_caches
cache:
paths:
- miniconda.sh
- ${CONDA_ROOT}/pkgs/*.tar.bz2
......@@ -146,14 +152,14 @@ build_macosx_36:
deploy_beta:
<<: *deploy_job
extends: .deploy_template
environment: beta
only:
- master
deploy_stable:
<<: *deploy_job
extends: .deploy_template
environment: stable
only:
- /^v\d+\.\d+\.\d+([abc]\d*)?$/ # PEP-440 compliant version (tags)
......@@ -178,5 +184,7 @@ pypi:
dependencies:
- build_linux_36
- build_macosx_36
- build_linux_37
- build_macosx_37
tags:
- docker
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