Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tests after modifying the GitLab org-path to nf-core-test #2239

Merged
merged 13 commits into from
Apr 20, 2023

Conversation

mirpedrol
Copy link
Member

Follow up from #2228

PR checklist

  • This comment contains a description of changes (with reason)
  • CHANGELOG.md is updated
  • If you've fixed a bug or added code that should be tested, add tests!
  • Documentation in docs is updated

@mirpedrol mirpedrol changed the base branch from master to dev April 18, 2023 12:54
@nf-core nf-core deleted a comment from github-actions bot Apr 18, 2023
Copy link
Contributor

@mashehu mashehu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do I understand correctly, that we don't need the remove-function anymore, because can handle the conflicts now gracefully?

@mirpedrol
Copy link
Member Author

This remove function was added to avoid errors with the GitLab repo, as the org_path there was also nf-core. Now I changed the org_path to nf-core-test as @anoronh4 suggested, so we don't have to remove the modules :)
I think there are some tests failing still, but will hopefully be easy to fix them.

@mirpedrol mirpedrol requested a review from anoronh4 April 19, 2023 11:01
@codecov
Copy link

codecov bot commented Apr 19, 2023

Codecov Report

Merging #2239 (56a71ed) into dev (6ff6dee) will increase coverage by 0.07%.
The diff coverage is 100.00%.

❗ Current head 56a71ed differs from pull request most recent head 73172ea. Consider uploading reports for the commit 73172ea to get more accurate results

@@            Coverage Diff             @@
##              dev    #2239      +/-   ##
==========================================
+ Coverage   73.05%   73.12%   +0.07%     
==========================================
  Files          77       77              
  Lines        8342     8342              
==========================================
+ Hits         6094     6100       +6     
+ Misses       2248     2242       -6     
Impacted Files Coverage Δ
nf_core/modules/modules_json.py 80.07% <100.00%> (ø)

... and 2 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Copy link
Contributor

@anoronh4 anoronh4 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/mirpedrol/tools/blob/68019595938e7da13a2db68d41a29d336c5fe237/nf_core/modules/modules_json.py#L428-L442

This code chunk is causing a few tests to fail. Because we now have two org_paths certain discordant states are being caught that maybe shouldn't have passed before. i think we can fix this by simply replacing:

for dir_name in missing_installation[repo][component_type]:
    if component in missing_installation[repo][component_type][dir_name]:

with:

if install_dir in missing_installation[repo][component_type]:
    if component in missing_installation[repo][component_type][install_dir]:

that way we are matching installed components with the corresponding org_paths/repos instead of crossing wires.

@mirpedrol
Copy link
Member Author

Thanks for the suggestion @anoronh4 :)
For some reason, the new modules were not correctly installed in these tests, but they were locally and on Gitpod, so it was very difficult to debug!
Hopefully now everything is passing

@mirpedrol mirpedrol requested a review from anoronh4 April 20, 2023 07:36
@anoronh4
Copy link
Contributor

@mirpedrol interesting, i was able to reproduce the CI errors locally, but only after i cleared a local cache of the modules-test repo ~/.config/nfcore/nf-core/modules-test/ (seems like it didn't like my previously loaded git index). I think we are good to go now!

@mirpedrol mirpedrol merged commit 8c9cc54 into nf-core:dev Apr 20, 2023
@mirpedrol mirpedrol deleted the modified-gitlab-org branch April 20, 2023 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants