From d5cd8df56792c1d07d6bfe6afcf7bcc982543aa2 Mon Sep 17 00:00:00 2001 From: sambles Date: Mon, 24 Jun 2024 11:49:42 +0100 Subject: [PATCH] Fix MDK install test in CI (#184) * try newer python versions * fix * f * f --- .github/workflows/run_mdk.yml | 6 +++++- tests/run_mdk.py | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_mdk.yml b/.github/workflows/run_mdk.yml index 22947e01..bc4ce1cb 100644 --- a/.github/workflows/run_mdk.yml +++ b/.github/workflows/run_mdk.yml @@ -77,7 +77,7 @@ jobs: needs: ods_tools strategy: matrix: - py-version: [3.8, 3.9] + py-version: ["3.8", "3.9", "3.10"] steps: - name: Github context run: echo "$GITHUB_CONTEXT" @@ -132,6 +132,10 @@ jobs: pip uninstall ods_tools -y pip install ${{ needs.ods_tools.outputs.whl_filename }} + - name: install wheel + run: | + pip install wheel + - name: run MDK run: | ./run_mdk.py --model-repo-branch ${{ env.PIWIND_BRANCH}} \ diff --git a/tests/run_mdk.py b/tests/run_mdk.py index 09837040..e2ec76a5 100755 --- a/tests/run_mdk.py +++ b/tests/run_mdk.py @@ -120,7 +120,7 @@ def pip_install(pkg_name_or_branch_uri, options_str='', pip_path=get_default_pip if pkg_exists(pkg_name): pip_uninstall(pkg_name) - cmd_str = '{} install {} {}'.format(pip_path, options_str, pkg_name_or_branch_uri) + cmd_str = '{} install {} {} --break-system-packages'.format(pip_path, options_str, pkg_name_or_branch_uri) run_command(cmd_str) @@ -281,7 +281,7 @@ def cleanup(pip_path=get_default_pip_path(), mdk_pkg_name='oasislmf', model_run_ if args['git_transfer_protocol'] not in ['https', 'ssh']: args['git_transfer_protocol'] = 'ssh' - pkg_uri = 'git+{}://git@github.com/OasisLMF/OasisLMF.git@{}#egg=oasislmf[extra]'.format(args['git_transfer_protocol'], args['mdk_repo_branch']) + pkg_uri = 'oasislmf[extra]@git+{}://git@github.com/OasisLMF/OasisLMF.git@{}'.format(args['git_transfer_protocol'], args['mdk_repo_branch']) print('\nInstalling MDK package {}'.format(pkg_uri))