From 3c07960eb94767f5566aac8bffb2718a93c0645f Mon Sep 17 00:00:00 2001 From: Amir MOHAMMADI Date: Thu, 30 Sep 2021 21:49:42 +0200 Subject: [PATCH 1/7] Enable bob-devel builds Revert "[temp] temporarily disable bob-devel since metadata-patches need to be released first" This reverts commit 4d0191961ad46488fac7401b3f2fa0bb0ae3454e. --- .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f24dfe..f377109 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,10 +65,10 @@ stages: key: "macos-intel-cache" -# build_linux_bob_devel: -# extends: .build_linux_template -# script: -# - python3 ./bob/devtools/build.py -vv build-bob-devel +build_linux_bob_devel: + extends: .build_linux_template + script: + - python3 ./bob/devtools/build.py -vv build-bob-devel build_linux_deps: extends: .build_linux_template @@ -82,10 +82,10 @@ build_linux_bob_devtools: - pre-commit run --all-files --show-diff-on-failure - python3 ./bob/devtools/build.py -vv build-devtools --twine-check -# build_macos_intel_bob_devel: -# extends: .build_macos_intel_template -# script: -# - python3 ./bob/devtools/build.py -vv build-bob-devel +build_macos_intel_bob_devel: + extends: .build_macos_intel_template + script: + - python3 ./bob/devtools/build.py -vv build-bob-devel build_macos_intel_deps: extends: .build_macos_intel_template @@ -114,10 +114,10 @@ build_macos_intel_bob_devtools: - bdt ci deploy -vv - bdt ci clean -vv dependencies: - # - build_linux_bob_devel + - build_linux_bob_devel - build_linux_deps - build_linux_bob_devtools - # - build_macos_intel_bob_devel + - build_macos_intel_bob_devel - build_macos_intel_deps - build_macos_intel_bob_devtools tags: @@ -160,10 +160,10 @@ pypi: - bdt ci pypi -vv dist/*.zip - bdt ci clean -vv dependencies: - # - build_linux_bob_devel + - build_linux_bob_devel - build_linux_deps - build_linux_bob_devtools - # - build_macos_intel_bob_devel + - build_macos_intel_bob_devel - build_macos_intel_deps - build_macos_intel_bob_devtools tags: -- GitLab From 8fa461e5774985acddce4abe394b7a92c354eb76 Mon Sep 17 00:00:00 2001 From: Amir MOHAMMADI Date: Thu, 30 Sep 2021 22:10:41 +0200 Subject: [PATCH 2/7] use conda-forge all the time --- bob/devtools/bootstrap.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bob/devtools/bootstrap.py b/bob/devtools/bootstrap.py index 460b59f..3267952 100644 --- a/bob/devtools/bootstrap.py +++ b/bob/devtools/bootstrap.py @@ -558,6 +558,8 @@ if __name__ == "__main__": [conda_bin, "install", "--yes"] + conda_verbosity + [ + "-c", + "conda-forge", "-n", "base", "python", -- GitLab From 0aeb61b2dc1564bd6bc5f314533107071beff91c Mon Sep 17 00:00:00 2001 From: Amir MOHAMMADI Date: Thu, 30 Sep 2021 22:30:11 +0200 Subject: [PATCH 3/7] Always use the correct channels in base_build --- bob/devtools/build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bob/devtools/build.py b/bob/devtools/build.py index e91b29c..d5908c2 100644 --- a/bob/devtools/build.py +++ b/bob/devtools/build.py @@ -654,8 +654,8 @@ def base_build( add_dependent_channels=True, ) - if "channels" not in condarc_options: - condarc_options["channels"] = channels + # alays use the correct channel list: stable and public + condarc_options["channels"] = channels logger.info( "Using the following channels during (potential) build:\n - %s", -- GitLab From 974156156e7e43c2aebf32d8ebbc34248a0f9111 Mon Sep 17 00:00:00 2001 From: Amir MOHAMMADI Date: Thu, 30 Sep 2021 23:34:33 +0200 Subject: [PATCH 4/7] Fix bob-devel conflicts --- bob/devtools/data/conda_build_config.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bob/devtools/data/conda_build_config.yaml b/bob/devtools/data/conda_build_config.yaml index 3554083..8db59bf 100644 --- a/bob/devtools/data/conda_build_config.yaml +++ b/bob/devtools/data/conda_build_config.yaml @@ -376,8 +376,7 @@ numba: # we build against numpy 1.18 but test against newer versions. numpy: # part of a zip_keys: python, python_impl, numpy - - 1.18 # [not (osx and arm64)] - - 1.19 # [osx and arm64] + - 1.19.5 opencv: - 4.5.2 pandas: @@ -425,7 +424,7 @@ scikit_learn: scipy: - 1.7.1 setuptools: - - 58.0.4 + - 49.6.0 simplejson: - 3.17.5 six: @@ -458,5 +457,9 @@ vlfeat: - 0.9.20 xarray: - 0.19.0 +zc_buildout: + - 2.13.4 +zc_recipe_egg: + - 2.0.7 # AUTOMATIC PARSING END -- GitLab From c1b176b7cb4ba8ae78f9b824a99c84c295942cd8 Mon Sep 17 00:00:00 2001 From: Amir MOHAMMADI Date: Fri, 1 Oct 2021 09:40:34 +0200 Subject: [PATCH 5/7] fix opencv version for mac --- bob/devtools/data/conda_build_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bob/devtools/data/conda_build_config.yaml b/bob/devtools/data/conda_build_config.yaml index 8db59bf..359743c 100644 --- a/bob/devtools/data/conda_build_config.yaml +++ b/bob/devtools/data/conda_build_config.yaml @@ -378,7 +378,7 @@ numpy: # part of a zip_keys: python, python_impl, numpy - 1.19.5 opencv: - - 4.5.2 + - 4.5.1 pandas: - 1.3.3 pillow: -- GitLab From 83e5e22011ed9947849be39b445b8ad9130ea498 Mon Sep 17 00:00:00 2001 From: Amir MOHAMMADI Date: Fri, 1 Oct 2021 09:52:10 +0200 Subject: [PATCH 6/7] we don't need vlfeat anymore --- bob/devtools/data/conda_build_config.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/bob/devtools/data/conda_build_config.yaml b/bob/devtools/data/conda_build_config.yaml index 359743c..d473f2e 100644 --- a/bob/devtools/data/conda_build_config.yaml +++ b/bob/devtools/data/conda_build_config.yaml @@ -453,8 +453,6 @@ torchvision: - 0.10.1 tqdm: - 4.62.3 -vlfeat: - - 0.9.20 xarray: - 0.19.0 zc_buildout: -- GitLab From 4125860f03b4f188bcf97e73047a46baf6265ecf Mon Sep 17 00:00:00 2001 From: Amir MOHAMMADI Date: Fri, 1 Oct 2021 10:47:04 +0200 Subject: [PATCH 7/7] remove ~/.conda if it exists unless it's mac machine --- bob/devtools/data/gitlab-ci/nightlies.yaml | 3 ++- bob/devtools/data/gitlab-ci/noarch.yaml | 3 ++- bob/devtools/data/gitlab-ci/single-package.yaml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml index 94df69e..ab60695 100644 --- a/bob/devtools/data/gitlab-ci/nightlies.yaml +++ b/bob/devtools/data/gitlab-ci/nightlies.yaml @@ -20,7 +20,8 @@ stages: .bootstrap: before_script: - "[ -r ~/.condarc ] && rm -f ~/.condarc" - - "[ -d ~/.conda ] && rm -rf ~/.conda" + # remove ~/.conda if it exists unless it's a mac machine + - "[ -d ~/.conda ] && [ ! -d /Applications ] && rm -rf ~/.conda" - curl --silent "${BOOTSTRAP}" --output "bootstrap.py" - python3 bootstrap.py -vv channel base - source ${CONDA_ROOT}/etc/profile.d/conda.sh diff --git a/bob/devtools/data/gitlab-ci/noarch.yaml b/bob/devtools/data/gitlab-ci/noarch.yaml index e073cad..5978b11 100644 --- a/bob/devtools/data/gitlab-ci/noarch.yaml +++ b/bob/devtools/data/gitlab-ci/noarch.yaml @@ -22,7 +22,8 @@ stages: .bootstrap: before_script: - "[ -r ~/.condarc ] && rm -f ~/.condarc" - - "[ -d ~/.conda ] && rm -rf ~/.conda" + # remove ~/.conda if it exists unless it's a mac machine + - "[ -d ~/.conda ] && [ ! -d /Applications ] && rm -rf ~/.conda" - curl --silent "${BOOTSTRAP}" --output "bootstrap.py" - python3 bootstrap.py -vv channel bdt - source ${CONDA_ROOT}/etc/profile.d/conda.sh diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml index 578349f..67b08f7 100644 --- a/bob/devtools/data/gitlab-ci/single-package.yaml +++ b/bob/devtools/data/gitlab-ci/single-package.yaml @@ -22,7 +22,8 @@ stages: .bootstrap: before_script: - "[ -r ~/.condarc ] && rm -f ~/.condarc" - - "[ -d ~/.conda ] && rm -rf ~/.conda" + # remove ~/.conda if it exists unless it's a mac machine + - "[ -d ~/.conda ] && [ ! -d /Applications ] && rm -rf ~/.conda" - curl --silent "${BOOTSTRAP}" --output "bootstrap.py" - python3 bootstrap.py -vv channel bdt - source ${CONDA_ROOT}/etc/profile.d/conda.sh -- GitLab