Skip to content

Commit

Permalink
Fix MDK install test in CI (#184)
Browse files Browse the repository at this point in the history
* try newer python versions

* fix

* f

* f
  • Loading branch information
sambles committed Jun 24, 2024
1 parent 1605466 commit d5cd8df
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/run_mdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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}} \
Expand Down
4 changes: 2 additions & 2 deletions tests/run_mdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down Expand Up @@ -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+{}://[email protected]/OasisLMF/OasisLMF.git@{}#egg=oasislmf[extra]'.format(args['git_transfer_protocol'], args['mdk_repo_branch'])
pkg_uri = 'oasislmf[extra]@git+{}://[email protected]/OasisLMF/OasisLMF.git@{}'.format(args['git_transfer_protocol'], args['mdk_repo_branch'])

print('\nInstalling MDK package {}'.format(pkg_uri))

Expand Down

0 comments on commit d5cd8df

Please sign in to comment.