From b8dbbeaba9a70bfbeb6e30e5597ffb9f0b6084fb Mon Sep 17 00:00:00 2001 From: vinferrer Date: Fri, 25 Jun 2021 10:45:25 +0200 Subject: [PATCH 1/8] add python 3.10 testing --- .cirrus.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 7b64acd79..f62e98568 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -10,6 +10,7 @@ makeenv_task: PYTHON: 3.7 PYTHON: 3.8 PYTHON: 3.9 + PYTHON: 3.10 environment_cache: folder: conda-env fingerprint_script: @@ -30,6 +31,7 @@ Unittest_task: PYTHON: 3.7 PYTHON: 3.8 PYTHON: 3.9 + PYTHON: 3.10 CODECOV_TOKEN: eb5758aa-6d0c-4981-a22a-16c663e2aaa9 environment_cache: folder: conda-env @@ -53,6 +55,7 @@ Integration_task: PYTHON: 3.7 PYTHON: 3.8 PYTHON: 3.9 + PYTHON: 3.10 CODECOV_TOKEN: eb5758aa-6d0c-4981-a22a-16c663e2aaa9 environment_cache: folder: conda-env @@ -76,6 +79,7 @@ Style_check_task: - makeenv env: PYTHON: 3.9 + PYTHON: 3.10 environment_cache: folder: conda-env fingerprint_script: @@ -93,6 +97,7 @@ Build_docs_task: - makeenv env: PYTHON: 3.9 + PYTHON: 3.10 environment_cache: folder: conda-env fingerprint_script: @@ -113,6 +118,7 @@ Bids_validate_task: - makeenv env: PYTHON: 3.9 + PYTHON: 3.10 environment_cache: folder: conda-env fingerprint_script: @@ -145,6 +151,7 @@ Integration_windows_task: env: matrix: PYTHON: 3.9 + PYTHON: 3.10 PYTHON: 3.8 PYTHON: 3.7 PYTHON: 3.6 @@ -165,6 +172,7 @@ Unittest_windows_task: env: matrix: PYTHON: 3.9 + PYTHON: 3.10 PYTHON: 3.8 PYTHON: 3.7 PYTHON: 3.6 From 5d8f622a759660d1f1335ddbb9771f88c4d917cc Mon Sep 17 00:00:00 2001 From: vinferrer Date: Tue, 26 Oct 2021 14:50:19 +0200 Subject: [PATCH 2/8] empty commit to trigger tests From 816ec2085fd035bd37074c41ffec74583e29c04c Mon Sep 17 00:00:00 2001 From: vinferrer Date: Tue, 26 Oct 2021 14:56:40 +0200 Subject: [PATCH 3/8] eliminate python 3.10 build --- .cirrus.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index f62e98568..0acfdf45b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -10,7 +10,6 @@ makeenv_task: PYTHON: 3.7 PYTHON: 3.8 PYTHON: 3.9 - PYTHON: 3.10 environment_cache: folder: conda-env fingerprint_script: @@ -31,7 +30,6 @@ Unittest_task: PYTHON: 3.7 PYTHON: 3.8 PYTHON: 3.9 - PYTHON: 3.10 CODECOV_TOKEN: eb5758aa-6d0c-4981-a22a-16c663e2aaa9 environment_cache: folder: conda-env @@ -55,7 +53,6 @@ Integration_task: PYTHON: 3.7 PYTHON: 3.8 PYTHON: 3.9 - PYTHON: 3.10 CODECOV_TOKEN: eb5758aa-6d0c-4981-a22a-16c663e2aaa9 environment_cache: folder: conda-env @@ -78,8 +75,7 @@ Style_check_task: depends_on: - makeenv env: - PYTHON: 3.9 - PYTHON: 3.10 + PYTHON: 3. environment_cache: folder: conda-env fingerprint_script: @@ -96,8 +92,7 @@ Build_docs_task: depends_on: - makeenv env: - PYTHON: 3.9 - PYTHON: 3.10 + PYTHON: 3. environment_cache: folder: conda-env fingerprint_script: @@ -117,8 +112,7 @@ Bids_validate_task: depends_on: - makeenv env: - PYTHON: 3.9 - PYTHON: 3.10 + PYTHON: 3. environment_cache: folder: conda-env fingerprint_script: @@ -151,7 +145,6 @@ Integration_windows_task: env: matrix: PYTHON: 3.9 - PYTHON: 3.10 PYTHON: 3.8 PYTHON: 3.7 PYTHON: 3.6 @@ -172,7 +165,6 @@ Unittest_windows_task: env: matrix: PYTHON: 3.9 - PYTHON: 3.10 PYTHON: 3.8 PYTHON: 3.7 PYTHON: 3.6 From 67413326f95efdf168a2ea7948920126b12cab8b Mon Sep 17 00:00:00 2001 From: vinferrer Date: Tue, 26 Oct 2021 15:05:41 +0200 Subject: [PATCH 4/8] try with build esentials --- .cirrus.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 0acfdf45b..ac069b022 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -39,7 +39,8 @@ Unittest_task: populate_script: - source activate $PWD/conda-env Running_unit_tests_script: - - apt-get install -y make curl + - apt-get update + - apt-get install -y build-essential curl - source activate $PWD/conda-env - make unittest - bash <(curl -s https://codecov.io/bash) @@ -62,7 +63,7 @@ Integration_task: populate_script: - source activate $PWD/conda-env Running_integration_tests_script: - - apt-get install -y make curl tree tar + - apt-get install -y build-essential curl tree tar - source activate $PWD/conda-env - PATH=/home/test_user/.local/bin:$PATH - make integration From 579a64741a77657776aa18f9ed599ecbb30ad8a9 Mon Sep 17 00:00:00 2001 From: vinferrer Date: Tue, 26 Oct 2021 15:09:19 +0200 Subject: [PATCH 5/8] add apt-get update to intregration scripts --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index ac069b022..cc26785a6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -63,6 +63,7 @@ Integration_task: populate_script: - source activate $PWD/conda-env Running_integration_tests_script: + - apt-get update - apt-get install -y build-essential curl tree tar - source activate $PWD/conda-env - PATH=/home/test_user/.local/bin:$PATH From 156b3f754ebfddde7fedc24617d91b091c5063d3 Mon Sep 17 00:00:00 2001 From: vinferrer Date: Tue, 26 Oct 2021 15:13:06 +0200 Subject: [PATCH 6/8] correct error in style, bids validation and other tests --- .cirrus.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index cc26785a6..3502ff7a6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -77,7 +77,7 @@ Style_check_task: depends_on: - makeenv env: - PYTHON: 3. + PYTHON: 3.9 environment_cache: folder: conda-env fingerprint_script: @@ -94,7 +94,7 @@ Build_docs_task: depends_on: - makeenv env: - PYTHON: 3. + PYTHON: 3.9 environment_cache: folder: conda-env fingerprint_script: @@ -114,7 +114,7 @@ Bids_validate_task: depends_on: - makeenv env: - PYTHON: 3. + PYTHON: 3.9 environment_cache: folder: conda-env fingerprint_script: From d7f0f2fec9ee4ce43c46193eda9c240584b498ce Mon Sep 17 00:00:00 2001 From: vinferrer Date: Tue, 26 Oct 2021 15:17:03 +0200 Subject: [PATCH 7/8] use build-essential in the style test --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 3502ff7a6..6bfb0c82b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -86,7 +86,7 @@ Style_check_task: populate_script: - source activate $PWD/conda-env Lintin_script: - - apt-get install -y make + - apt-get install -y build-essential - source activate $PWD/conda-env - make lint @@ -103,7 +103,7 @@ Build_docs_task: populate_script: - source activate $PWD/conda-env Build_documentation_script: - - apt-get install -y make tar + - apt-get install -y build-essential tar - source activate $PWD/conda-env - make -C docs html docs_artifacts: From fcabaf1ac0c4446e20ebf9b9589c1dc586187614 Mon Sep 17 00:00:00 2001 From: vinferrer Date: Tue, 26 Oct 2021 15:26:22 +0200 Subject: [PATCH 8/8] add apt-get update to the style test --- .cirrus.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 6bfb0c82b..9a64032a8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -86,6 +86,7 @@ Style_check_task: populate_script: - source activate $PWD/conda-env Lintin_script: + - apt-get update - apt-get install -y build-essential - source activate $PWD/conda-env - make lint @@ -103,6 +104,7 @@ Build_docs_task: populate_script: - source activate $PWD/conda-env Build_documentation_script: + - apt-get update - apt-get install -y build-essential tar - source activate $PWD/conda-env - make -C docs html @@ -123,6 +125,7 @@ Bids_validate_task: populate_script: - source activate $PWD/conda-env Generate_enviroment_script: + - apt-get update - apt-get install -yqq wget curl tree - curl -sL https://deb.nodesource.com/setup_15.x | bash - - apt-get install -yqq nodejs