From 08d5e14db8bcf597ab417f7a0033d9ed6a72eadb Mon Sep 17 00:00:00 2001
From: Tiago Freitas Pereira <tiagofrepereira@gmail.com>
Date: Tue, 17 Nov 2020 10:31:16 +0100
Subject: [PATCH] Removed python 3.6 support
---
bob/devtools/data/conda_build_config.yaml | 1 -
.../data/gitlab-ci/beat-docker-package.yaml | 4 ----
bob/devtools/data/gitlab-ci/nightlies.yaml | 18 ------------------
.../data/gitlab-ci/single-package.yaml | 14 --------------
conda/conda_build_config.yaml | 1 -
5 files changed, 38 deletions(-)
diff --git a/bob/devtools/data/conda_build_config.yaml b/bob/devtools/data/conda_build_config.yaml
index b76f2801..c5363c8f 100644
--- a/bob/devtools/data/conda_build_config.yaml
+++ b/bob/devtools/data/conda_build_config.yaml
@@ -55,7 +55,6 @@ pin_run_as_build:
## the dependencies that we build against multiple versions
python:
- - 3.6
- 3.7
- 3.8
diff --git a/bob/devtools/data/gitlab-ci/beat-docker-package.yaml b/bob/devtools/data/gitlab-ci/beat-docker-package.yaml
index 83568eda..cf45e9c2 100644
--- a/bob/devtools/data/gitlab-ci/beat-docker-package.yaml
+++ b/bob/devtools/data/gitlab-ci/beat-docker-package.yaml
@@ -1,7 +1,3 @@
-build_linux_36:
- tags:
- - docker-build
-
build_linux_37:
tags:
- docker-build
diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml
index 66842583..acfdd376 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -43,14 +43,6 @@ stages:
- docker
image: docker.idiap.ch/bob/docker-images/c3i-linux-64
-
-build_linux_36:
- extends: .build_linux_template
- variables:
- PYTHON_VERSION: "3.6"
- cache:
- key: 'build-py36'
-
build_linux_37:
extends: .build_linux_template
variables:
@@ -58,16 +50,6 @@ build_linux_37:
cache:
key: 'build-py37'
-
-build_macosx_36:
- extends: .build_template
- variables:
- PYTHON_VERSION: "3.6"
- tags:
- - macosx
- cache:
- key: 'build-py36'
-
build_macosx_37:
extends: .build_template
variables:
diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml
index d469c32f..9bcf54ea 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -66,13 +66,6 @@ stages:
- ${CONDA_ROOT}/conda-bld/osx-64/*.tar.bz2
-build_macosx_36:
- extends: .build_macosx_template
- variables:
- PYTHON_VERSION: "3.6"
- cache:
- key: "build-py36"
-
build_macosx_37:
extends: .build_macosx_template
variables:
@@ -80,13 +73,6 @@ build_macosx_37:
cache:
key: "build-py37"
-build_linux_36:
- extends: .build_linux_template
- variables:
- PYTHON_VERSION: "3.6"
- cache:
- key: "build-py36"
-
build_linux_37:
extends: .build_linux_template
variables:
diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml
index a4c56ab1..4232180d 100644
--- a/conda/conda_build_config.yaml
+++ b/conda/conda_build_config.yaml
@@ -19,6 +19,5 @@ VERBOSE_CM:
## the dependencies that we build against multiple versions
python:
- - 3.6
- 3.7
- 3.8
--
GitLab