From 696938e67daa0bcbf92a9551eeee75f12917bb3a Mon Sep 17 00:00:00 2001 From: Richard Top Date: Fri, 1 Mar 2024 09:45:52 +0000 Subject: [PATCH 1/6] Temporary fix for CI by pinning archspec version --- .github/workflows/tests.yml | 2 +- .github/workflows/tests_init.yml | 2 +- .../pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8e74a4e844..faa7eb82ff 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,7 +22,7 @@ jobs: - name: install Python packages run: | - pip install archspec + pip install archspec==0.2.2 - name: test eessi_software_subdir.py script run: | diff --git a/.github/workflows/tests_init.yml b/.github/workflows/tests_init.yml index 38ccbbad31..053acb9730 100644 --- a/.github/workflows/tests_init.yml +++ b/.github/workflows/tests_init.yml @@ -22,7 +22,7 @@ jobs: - name: install Python packages run: | - pip install archspec pytest + pip install archspec==0.2.2 pytest - name: unit tests for eessi_software_subdir_for_host.py script run: diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml index 1db0363415..845697f9ca 100644 --- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml +++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml @@ -45,3 +45,4 @@ easyconfigs: - SAMtools-1.18-GCC-12.3.0.eb - VCFtools-0.1.16-GCC-12.3.0.eb - BEDTools-2.31.0-GCC-12.3.0.eb + - ASE-3.22.1-gfbf-2023a.eb From 95cee4022c2628c3657cfcda8f2dca142f9f9d54 Mon Sep 17 00:00:00 2001 From: TopRichard <121792457+TopRichard@users.noreply.github.com> Date: Fri, 1 Mar 2024 12:56:36 +0100 Subject: [PATCH 2/6] Remove-left-overs --- .../pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml index 845697f9ca..1db0363415 100644 --- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml +++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml @@ -45,4 +45,3 @@ easyconfigs: - SAMtools-1.18-GCC-12.3.0.eb - VCFtools-0.1.16-GCC-12.3.0.eb - BEDTools-2.31.0-GCC-12.3.0.eb - - ASE-3.22.1-gfbf-2023a.eb From 6e92f858442afcd2d0e3da2c30d14025dff5e089 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Wed, 6 Mar 2024 18:58:31 +0000 Subject: [PATCH 3/6] {2023.06}[foss/2023a] PLUMED V2.9.0 --- .../pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml index 1db0363415..ddc7f53a1e 100644 --- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml +++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml @@ -45,3 +45,4 @@ easyconfigs: - SAMtools-1.18-GCC-12.3.0.eb - VCFtools-0.1.16-GCC-12.3.0.eb - BEDTools-2.31.0-GCC-12.3.0.eb + - PLUMED-2.9.0-foss-2023a.eb From 4b98803f8378c5374816850082ee7e0c21186604 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Tue, 12 Mar 2024 18:41:06 +0000 Subject: [PATCH 4/6] added CDO/2.2.2-gompi/2023b package to build and test the changes --- .../pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023b.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023b.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023b.yml index 9d44bb5fdb..aded86723a 100644 --- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023b.yml +++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023b.yml @@ -6,4 +6,6 @@ easyconfigs: from-pr: 19534 - matplotlib-3.8.2-gfbf-2023b.eb: options: - from-pr: 19552 + - CDO-2.2.2-gompi-2023b.eb: + options: + from-pr: 19792 From c79fb068ca1b90e109c1702ac0d846d4e0cdfb39 Mon Sep 17 00:00:00 2001 From: TopRichard <121792457+TopRichard@users.noreply.github.com> Date: Tue, 12 Mar 2024 19:45:29 +0100 Subject: [PATCH 5/6] Fixed typo --- .../pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023b.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023b.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023b.yml index aded86723a..b6a097b3ab 100644 --- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023b.yml +++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023b.yml @@ -6,6 +6,7 @@ easyconfigs: from-pr: 19534 - matplotlib-3.8.2-gfbf-2023b.eb: options: + from-pr: 19552 - CDO-2.2.2-gompi-2023b.eb: options: from-pr: 19792 From b86878fbbdd39d6f275356862768cb7e798d5179 Mon Sep 17 00:00:00 2001 From: TopRichard <121792457+TopRichard@users.noreply.github.com> Date: Tue, 12 Mar 2024 20:24:04 +0100 Subject: [PATCH 6/6] reverted-changes-after-test --- .../pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023b.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023b.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023b.yml index b6a097b3ab..9d44bb5fdb 100644 --- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023b.yml +++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2023b.yml @@ -7,6 +7,3 @@ easyconfigs: - matplotlib-3.8.2-gfbf-2023b.eb: options: from-pr: 19552 - - CDO-2.2.2-gompi-2023b.eb: - options: - from-pr: 19792