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 CI fails #560

Merged
merged 3 commits into from
Jul 2, 2020
Merged

Conversation

bernt-matthias
Copy link
Contributor

@bernt-matthias bernt-matthias commented Jun 2, 2020

Try to fix tools failing in the first run of the CI workflow: https://github.com/galaxyproject/tools-devteam/actions/runs/120951902

Other changes to testing framework:

  • adds --no_dependency_resolution to planemo test
  • PR: make test only depend on setup
  • setup.cfg
  • remove outdated tools from .tt_skip

TODO:

+1: In png(filename = args$filename, width = args$width, height = args$height,  :
+  unable to load shared object '/usr/local/lib/R/library/grDevices/libs//cairo.so':
+  libXrender.so.1: cannot open shared object file: No such file or directory

@bernt-matthias bernt-matthias force-pushed the topic/fix_ci_fails branch 3 times, most recently from db55bff to 8cdbe7a Compare June 2, 2020 12:13
tools/substitutions/substitutions.xml Outdated Show resolved Hide resolved
tools/substitutions/substitutions.xml Outdated Show resolved Hide resolved
tools/dwt_var_perfeature/execute_dwt_var_perFeature.xml Outdated Show resolved Hide resolved
tools/convert_characters/convert_characters.py Outdated Show resolved Hide resolved
tools/convert_characters/convert_characters.py Outdated Show resolved Hide resolved
tools/convert_characters/convert_characters.py Outdated Show resolved Hide resolved
tools/convert_characters/convert_characters.py Outdated Show resolved Hide resolved
@bernt-matthias bernt-matthias changed the title [WIP] Fix CI fails Fix CI fails Jun 8, 2020
tools/substitutions/substitutions.py Outdated Show resolved Hide resolved
tools/substitutions/substitutions.py Outdated Show resolved Hide resolved
tool_collections/cufflinks/cufflinks/cufflinks_wrapper.py Outdated Show resolved Hide resolved
tool_collections/cufflinks/cufflinks/cufflinks_wrapper.py Outdated Show resolved Hide resolved
tool_collections/cufflinks/cufflinks/cufflinks_wrapper.py Outdated Show resolved Hide resolved
tool_collections/cufflinks/cufflinks/cufflinks_wrapper.py Outdated Show resolved Hide resolved
tool_collections/cufflinks/cufflinks/cufflinks_wrapper.py Outdated Show resolved Hide resolved
tool_collections/cufflinks/cufflinks/cufflinks_wrapper.py Outdated Show resolved Hide resolved
@bernt-matthias bernt-matthias force-pushed the topic/fix_ci_fails branch 3 times, most recently from 980e44f to 7fce367 Compare June 9, 2020 13:07
tools/cummerbund/cummeRbund.xml Outdated Show resolved Hide resolved
tools/cummerbund/cummeRbund.xml Show resolved Hide resolved
tools/cummerbund/cummeRbund.xml Outdated Show resolved Hide resolved
tools/substitutions/substitutions.py Outdated Show resolved Hide resolved
@bernt-matthias
Copy link
Contributor Author

@nsoranzo note that I increased the allowed cyclomatic complexity (for lintr) to 25 which seems to the the documented default ..

still, 1 is failing: tools/dwt_var_perclass/execute_dwt_var_perClass.R:21:1 functions should have cyclomatic complexity of less than 25, this has 27.

any ideas .. I just don't want to touch the code more than necessary

@nsoranzo
Copy link
Member

What about cyclocomp_linter = NULL ?

@bernt-matthias bernt-matthias force-pushed the topic/fix_ci_fails branch 2 times, most recently from 434ae08 to 120c5ed Compare June 30, 2020 17:39
@bernt-matthias
Copy link
Contributor Author

What about cyclocomp_linter = NULL ?

This is an option. But, actually I found it a useful indicator of bad code. Maybe its acceptable to simply ignore such errors if submitter has done everything to improve the code...

@nsoranzo
Copy link
Member

I agree it's a useful indicator, but maybe it's a bit too invasive compared to space and indentation style changes. No strong opinion any way.

cummerbund: fix requirements

- 2.16.0 was not installable anymore (conda took forever)
  2.20 was the closest that worked. I added r-base to speed up conda.
- added fonts for pngs that actually contain text
- removed unneeded r-png requirement
- switch from test data to asserts

cufflinks:

- moved to IUC galaxyproject/tools-iuc#3069

dwt*:

- remove perl wrappers and use Rscripts directly

Co-authored-by: Nicola Soranzo <[email protected]>
@bernt-matthias
Copy link
Contributor Author

Ready from my side.

tools/cummerbund/cummeRbund_macros.xml Outdated Show resolved Hide resolved
tools/cummerbund/cummeRbund.xml Outdated Show resolved Hide resolved
tools/dwt_cor_avb_all/execute_dwt_cor_aVb_all.xml Outdated Show resolved Hide resolved
tools/dwt_ivc_all/execute_dwt_IvC_all.xml Outdated Show resolved Hide resolved
tools/dwt_ivc_all/execute_dwt_IvC_all.xml Outdated Show resolved Hide resolved
tools/dwt_var_perclass/execute_dwt_var_perClass.xml Outdated Show resolved Hide resolved
@nsoranzo nsoranzo merged commit f929353 into galaxyproject:master Jul 2, 2020
@nsoranzo
Copy link
Member

nsoranzo commented Jul 2, 2020

Thanks @bernt-matthias , fantastic work!

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.

2 participants