From 0ecb5795f8a92a04d4dbf08f0508e7cb5a1f64a0 Mon Sep 17 00:00:00 2001 From: Meagan Lang Date: Tue, 21 May 2024 17:52:09 -0400 Subject: [PATCH] Try installing an older version of R, since RcppTOML won't build from source for 4.4 Updated schema --- .github/workflows/test-install.yml | 30 ++++++++++++++++++++++ utils/test-install-base.yml | 12 ++++----- yggdrasil/.ygg_schema.yml | 40 ------------------------------ 3 files changed, 36 insertions(+), 46 deletions(-) diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml index 36ba44e03..7dc784e2e 100644 --- a/.github/workflows/test-install.yml +++ b/.github/workflows/test-install.yml @@ -363,6 +363,12 @@ jobs: == 1 name: (WINDOWS,PIP) Set up MSMPI uses: mpi4py/setup-mpi@v1 + - if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLR + == 1 + name: Install R + uses: r-lib/actions/setup-r@v2 + with: + r-version: 4.3.3 - if: startsWith(runner.os, 'Linux') && matrix.install-method == 'pip' name: (LINUX,PIP) Cache pip uses: actions/cache@v4 @@ -765,6 +771,12 @@ jobs: == 1 name: (WINDOWS,PIP) Set up MSMPI uses: mpi4py/setup-mpi@v1 + - if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLR + == 1 + name: Install R + uses: r-lib/actions/setup-r@v2 + with: + r-version: 4.3.3 - if: startsWith(runner.os, 'Linux') && matrix.install-method == 'pip' name: (LINUX,PIP) Cache pip uses: actions/cache@v4 @@ -1143,6 +1155,12 @@ jobs: == 1 name: (WINDOWS,PIP) Set up MSMPI uses: mpi4py/setup-mpi@v1 + - if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLR + == 1 + name: Install R + uses: r-lib/actions/setup-r@v2 + with: + r-version: 4.3.3 - if: startsWith(runner.os, 'Linux') && matrix.install-method == 'pip' name: (LINUX,PIP) Cache pip uses: actions/cache@v4 @@ -1502,6 +1520,12 @@ jobs: == 1 name: (WINDOWS,PIP) Set up MSMPI uses: mpi4py/setup-mpi@v1 + - if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLR + == 1 + name: Install R + uses: r-lib/actions/setup-r@v2 + with: + r-version: 4.3.3 - if: startsWith(runner.os, 'Linux') && matrix.install-method == 'pip' name: (LINUX,PIP) Cache pip uses: actions/cache@v4 @@ -1860,6 +1884,12 @@ jobs: == 1 name: (WINDOWS,PIP) Set up MSMPI uses: mpi4py/setup-mpi@v1 + - if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLR + == 1 + name: Install R + uses: r-lib/actions/setup-r@v2 + with: + r-version: 4.3.3 - if: startsWith(runner.os, 'Linux') && matrix.install-method == 'pip' name: (LINUX,PIP) Cache pip uses: actions/cache@v4 diff --git a/utils/test-install-base.yml b/utils/test-install-base.yml index 986d9d7c7..eb9264191 100644 --- a/utils/test-install-base.yml +++ b/utils/test-install-base.yml @@ -140,12 +140,12 @@ jobs: - name: (WINDOWS,PIP) Set up MSMPI uses: mpi4py/setup-mpi@v1 if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLMPI == 1 - # - name: Install R - # uses: r-lib/actions/setup-r@v2 - # if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLR == 1 - # with: - # r-version: '4.2.3' - # # windows-path-include-rtools: false + - name: Install R + uses: r-lib/actions/setup-r@v2 + if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLR == 1 + with: + r-version: '4.3.3' + # windows-path-include-rtools: false - name: (LINUX,PIP) Cache pip uses: actions/cache@v4 if: startsWith(runner.os, 'Linux') && matrix.install-method == 'pip' diff --git a/yggdrasil/.ygg_schema.yml b/yggdrasil/.ygg_schema.yml index d9098fa6a..f1ad81c3b 100644 --- a/yggdrasil/.ygg_schema.yml +++ b/yggdrasil/.ygg_schema.yml @@ -2816,16 +2816,6 @@ definitions: default: false description: If True, the Python C API will be disabled. Defaults to False. type: boolean - disassembler: - description: Name of disassembler that should be used to build the model - type: string - disassembler_flags: - default: [] - description: Flags that should be passed to the disassemblerwhen building - the model - items: - type: string - type: array driver: deprecated: true description: '[DEPRECATED] Name of driver class that should be used.' @@ -3400,16 +3390,6 @@ definitions: default: false description: If True, the Python C API will be disabled. Defaults to False. type: boolean - disassembler: - description: Name of disassembler that should be used to build the model - type: string - disassembler_flags: - default: [] - description: Flags that should be passed to the disassemblerwhen building - the model - items: - type: string - type: array driver: deprecated: true description: '[DEPRECATED] Name of driver class that should be used.' @@ -3640,16 +3620,6 @@ definitions: default: false description: If True, the Python C API will be disabled. Defaults to False. type: boolean - disassembler: - description: Name of disassembler that should be used to build the model - type: string - disassembler_flags: - default: [] - description: Flags that should be passed to the disassemblerwhen building - the model - items: - type: string - type: array driver: deprecated: true description: '[DEPRECATED] Name of driver class that should be used.' @@ -3821,16 +3791,6 @@ definitions: default: false description: If True, the Python C API will be disabled. Defaults to False. type: boolean - disassembler: - description: Name of disassembler that should be used to build the model - type: string - disassembler_flags: - default: [] - description: Flags that should be passed to the disassemblerwhen building - the model - items: - type: string - type: array driver: deprecated: true description: '[DEPRECATED] Name of driver class that should be used.'