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

New-new schema #695

Merged
merged 36 commits into from
Jul 28, 2020
Merged

New-new schema #695

merged 36 commits into from
Jul 28, 2020

Conversation

ewels
Copy link
Member

@ewels ewels commented Jul 27, 2020

Updated nf-core/tools for the newer style of pipeline schema, using sub-schema in definitions for grouping. See #687

x-ref #688 and note that the PR is to the new-new-schema branch (we want to merge all of this in one go if possible).

Quite a bit in this PR, but some key points:

PR checklist

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

ewels and others added 26 commits July 23, 2020 13:23
Use fnmatch to properly apply glob expressions found in the .gitignore file
* Check that we have at least 1 parameter, fail if not
* Log number of parameters found
* Use 'pipeline schema' instead of 'JSON Schema' in logging
* Work with top-level schema and defintions sub-schema
* Strip out logic about object-type properties
* Test nf-core schema build with dummy pipeline
Also update all pytest.mark.xfail to use strict=True, so fails if an exception is not raised.
@ewels ewels requested a review from mashehu July 27, 2020 15:37
@codecov
Copy link

codecov bot commented Jul 27, 2020

Codecov Report

Merging #695 into new-new-schema will increase coverage by 1.07%.
The diff coverage is 72.07%.

Impacted file tree graph

@@                Coverage Diff                 @@
##           new-new-schema     #695      +/-   ##
==================================================
+ Coverage           81.41%   82.49%   +1.07%     
==================================================
  Files                  13       13              
  Lines                2696     2725      +29     
==================================================
+ Hits                 2195     2248      +53     
+ Misses                501      477      -24     
Impacted Files Coverage Δ
nf_core/bump_version.py 94.36% <ø> (ø)
nf_core/create.py 94.44% <ø> (ø)
nf_core/sync.py 62.25% <0.00%> (ø)
nf_core/launch.py 70.94% <23.68%> (+0.91%) ⬆️
nf_core/__main__.py 63.63% <25.00%> (-1.23%) ⬇️
nf_core/schema.py 91.34% <93.75%> (+3.67%) ⬆️
nf_core/lint.py 91.93% <100.00%> (+0.31%) ⬆️
nf_core/utils.py 91.11% <100.00%> (+0.06%) ⬆️
nf_core/list.py 80.07% <0.00%> (+5.36%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6b84b54...8851af8. Read the comment docs.

ewels added a commit to ewels/nf-core-website that referenced this pull request Jul 28, 2020
ewels added 3 commits July 28, 2020 11:31
@ewels ewels linked an issue Jul 28, 2020 that may be closed by this pull request
3 tasks
@apeltzer apeltzer merged commit 6219274 into nf-core:new-new-schema Jul 28, 2020
@ewels ewels deleted the new-new-schema branch July 29, 2020 08: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.

JSON Schema - ditch object group hack
2 participants