Skip to content

Scoped ref and typedsl #95

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

Merged
merged 16 commits into from
Jun 10, 2016
Merged

Scoped ref and typedsl #95

merged 16 commits into from
Jun 10, 2016

Conversation

tetron
Copy link
Member

@tetron tetron commented Jun 8, 2016

Update to support draft-4.dev2 for scoped references and type DSL features.

Peter Amstutz and others added 14 commits June 7, 2016 17:42
d03b190 Introducing refScope and typeDSL into CWL schema
5e1e438 Merge commit '851b3c1302aa5b5d8a80f74c5732a617f62acefe' into scoped-ref-and-typedsl
851b3c1 Split minimal base types used in CWL into metaschema_base.yml
510a01f Merge commit '8823aaa11432aa042b3e307891e71ee13e11bfd7' into scoped-ref-and-typedsl
8823aaa Adjust ref scopes
3431e18 Use scopedRef and typeDSL in metaschema
1e6dab6 Using typeDSL in metaschema.
3055f70 Update bootstrap context.
31db28e Merge branch 'master' into type_dsl.  Add test for typeDSL.
116d9e4 Merge branch 'resolve_all_refactor'
8072bf5 "type" DSL wip
33ef215 Refactor resolve_all into smaller methods.
ad8a111 Merge pull request #28 from common-workflow-language/scoped_ref
5aadf27 fix types
4ef52be Improve documentation.  Add feature of skipping some inner scopes.
c6d4a7b Reworking refScope to be fixed instead of search based.
ae0ef4e Remove explicit calls to validate_links since it is folded into resolve_all().
2fa6bfb update types
e5d4730 New test for scoped ref that better reflects actual desired behavior.
efbc9c4 Add scopedRef to metaschema.  Tweak test.
9fcd67d Fold link validation into resolve_all() and resolve scoped identifiers.
f36f52f Merge pull request #219 from denis-yuen/patch-1
da10eec always be updating (mypy-lang)
e1e17ea upgrade Jenkins setuptools
563e5ef fix jenkins build
11b45b5 Merge pull request #224 from common-workflow-language/jenkins-link
b4d790d Backport fixes to draft-3
1ea9a5c add jenkins link
180a21e Corrections and test data
f0ac285 Merge branch 'master' of github.com:common-workflow-language/schema_salad
84738f1 better RDF schema error handling (#26)
3b8dc09 mypy 0.4 is out (#25)
5316da0 Add missing files for site generation.
31fbb76 Fix site generation workflows to specify draft-3
cff09a0 Add link to latest User Guide on front page
53b2ad7 Merge pull request #200 from common-workflow-language/draft-4
089fbd7 start documenting the draft-4 changes
8c5bda0 Fix mapSubject fields when $import or $include is provided.
5b969ca fix diff-cover
d798a7e split out mypy
f43fa45 Fix tests
2d0398e Bump version.
aeab7c3 Merge branch 'master' of github.com:common-workflow-language/schema_salad
e381f64 Return metaschema loader from load_schema.  Don't crash expanding identifier fields when value is not a string.
15dae9f enhance CI
fd2fcb3 more type checking (#21)
c51c723 enable rdfa schema format (#22)
ff192e8 turn off py3 support for now (#19)
0c5dba5 measure code coverage (#12)
2514a23 switch to ruamel.yaml, use C loader if available, only load safely (#20)

git-subtree-dir: cwltool/schemas
git-subtree-split: d03b190
50bd76a Updating to draft-4.dev2

git-subtree-dir: cwltool/schemas
git-subtree-split: 50bd76a
3e1b02c Merge commit '6ac559ed62780091eb0cfff914018ed101ef46ef' into scoped-ref-and-typedsl
6ac559e version bump
2cfde6b Merge pull request #32 from common-workflow-language/type_dsl
b8edddc re-enable test_avro_regression
bedb736 Merge branch 'type_dsl' of github.com:common-workflow-language/schema_salad into type_dsl
e93b038 Add missing file
9ca6cc9 remove more str types, possible fix for edam failed test
d65fb83 more unicode
4350b30 type clarification
96f08e8 Merge remote-tracking branch 'origin/master' into type_dsl
57f7e83 borrow the updated re.pyi from typeshed
c03eb1e type fixes
6e71f35 Merge remote-tracking branch 'origin/master' into type_dsl
68a5c6c More updating to draft-4.dev2
97e8f75 More updating to draft-4.dev2
e554b2b Merge pull request #33 from common-workflow-language/fix-resolve_all_refactor
ad34521 fix bug introduced by refactor
5393edc fixes types, removes a few more Anys
e298bdc Detect when an abstract class is used but doesn't have a concrete subtype.

git-subtree-dir: cwltool/schemas
git-subtree-split: 3e1b02c
@mr-c
Copy link
Member

mr-c commented Jun 10, 2016

I'm seeing a regression with test #46; investigating now.

@mr-c
Copy link
Member

mr-c commented Jun 10, 2016

(draft-3 and draft-4 both fail #46)

@mr-c
Copy link
Member

mr-c commented Jun 10, 2016

Regressions fixed!

@mr-c mr-c merged commit a8d324b into master Jun 10, 2016
@mr-c mr-c deleted the scoped-ref-and-typedsl branch June 10, 2016 11:11
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