From bbc7ea4691e49b2494aa9a57011fb244ebd55e3d Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Fri, 26 Nov 2021 06:59:37 +0100
Subject: [PATCH] [data/gitlab-ci] adds support for py39 builds
---
bob/devtools/data/conda_build_config.yaml | 1 +
.../data/gitlab-ci/beat-docker-package.yaml | 5 +++++
bob/devtools/data/gitlab-ci/docs.yaml | 2 +-
bob/devtools/data/gitlab-ci/nightlies.yaml | 18 +++++++++++++++++
bob/devtools/data/gitlab-ci/noarch.yaml | 4 ++--
.../data/gitlab-ci/single-package.yaml | 20 ++++++++++++++++++-
6 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/bob/devtools/data/conda_build_config.yaml b/bob/devtools/data/conda_build_config.yaml
index 270a4ab1..bae9bad0 100644
--- a/bob/devtools/data/conda_build_config.yaml
+++ b/bob/devtools/data/conda_build_config.yaml
@@ -128,6 +128,7 @@ channel_sources:
python:
# part of a zip_keys: python, python_impl, numpy
- 3.8.* *_cpython
+ - 3.9.* *_cpython
python_impl:
# part of a zip_keys: python, python_impl, numpy
- cpython
diff --git a/bob/devtools/data/gitlab-ci/beat-docker-package.yaml b/bob/devtools/data/gitlab-ci/beat-docker-package.yaml
index f25e1315..0c0757b8 100644
--- a/bob/devtools/data/gitlab-ci/beat-docker-package.yaml
+++ b/bob/devtools/data/gitlab-ci/beat-docker-package.yaml
@@ -2,3 +2,8 @@ build_linux_38:
tags:
- bob
- docker-build
+
+build_linux_39:
+ tags:
+ - bob
+ - docker-build
diff --git a/bob/devtools/data/gitlab-ci/docs.yaml b/bob/devtools/data/gitlab-ci/docs.yaml
index b1929015..c0fd510c 100644
--- a/bob/devtools/data/gitlab-ci/docs.yaml
+++ b/bob/devtools/data/gitlab-ci/docs.yaml
@@ -39,7 +39,7 @@ build:
stage: build
variables:
GITLAB_CHECKOUT_STRATEGY: "https://gitlab-ci-token:${CI_BUILD_TOKEN}@gitlab.idiap.ch/"
- PYTHON_VERSION: "3.8"
+ PYTHON_VERSION: "3.9"
BUILD_EGG: "true"
script:
- bdt ci docs -vv packages.txt
diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml
index f9a072a8..13a10e06 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -53,6 +53,13 @@ build_linux_38:
cache:
key: 'build-py38'
+build_linux_39:
+ extends: .build_linux_template
+ variables:
+ PYTHON_VERSION: "3.9"
+ cache:
+ key: 'build-py39'
+
build_macos_intel_38:
extends: .build_template
variables:
@@ -64,6 +71,17 @@ build_macos_intel_38:
cache:
key: 'build-py38'
+build_macos_intel_39:
+ extends: .build_template
+ variables:
+ PYTHON_VERSION: "3.9"
+ tags:
+ - bob
+ - macos
+ - intel
+ cache:
+ key: 'build-py39'
+
# Periodic cleanup of beta packages
.cleanup_template:
diff --git a/bob/devtools/data/gitlab-ci/noarch.yaml b/bob/devtools/data/gitlab-ci/noarch.yaml
index 1b45959e..7a54afc8 100644
--- a/bob/devtools/data/gitlab-ci/noarch.yaml
+++ b/bob/devtools/data/gitlab-ci/noarch.yaml
@@ -55,7 +55,7 @@ build_linux:
- docker
image: quay.io/condaforge/linux-anvil-cos7-x86_64
variables:
- PYTHON_VERSION: "3.8"
+ PYTHON_VERSION: "3.9"
BUILD_EGG: "true"
script:
- bdt ci build -vv
@@ -73,7 +73,7 @@ build_linux:
build_macos_intel:
variables:
- PYTHON_VERSION: "3.8"
+ PYTHON_VERSION: "3.9"
cache:
key: "build"
extends: .build_template
diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml
index 8bb8bba9..107849e2 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -79,10 +79,24 @@ build_macos_intel_38:
cache:
key: "build-py38"
+build_macos_intel_39:
+ extends: .build_macos_intel_template
+ variables:
+ PYTHON_VERSION: "3.9"
+ cache:
+ key: "build-py39"
+
build_linux_38:
extends: .build_linux_template
variables:
PYTHON_VERSION: "3.8"
+ cache:
+ key: "build-py38"
+
+build_linux_39:
+ extends: .build_linux_template
+ variables:
+ PYTHON_VERSION: "3.9"
BUILD_EGG: "true"
script:
- bdt ci build -vv
@@ -95,7 +109,7 @@ build_linux_38:
- ${CONDA_ROOT}/conda-bld/linux-64/*.conda
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
cache:
- key: "build-py38"
+ key: "build-py39"
# Test targets (not normally used)
@@ -136,7 +150,9 @@ build_linux_38:
- bdt ci clean -vv
dependencies:
- build_linux_38
+ - build_linux_39
- build_macos_intel_38
+ - build_macos_intel_39
tags:
- bob
- docker
@@ -176,7 +192,9 @@ pypi:
- bdt ci clean -vv
dependencies:
- build_linux_38
+ - build_linux_39
- build_macos_intel_38
+ - build_macos_intel_39
tags:
- bob
- docker
--
GitLab