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

Expressions in Janis #10

Closed
wants to merge 141 commits into from
Closed

Expressions in Janis #10

wants to merge 141 commits into from

Commits on Jan 21, 2020

  1. Add operator class as test

    illusional committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    0395ea5 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2020

  1. Configuration menu
    Copy the full SHA
    162afe8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0442f0a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    767ce97 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9bd8dc8 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2020

  1. Configuration menu
    Copy the full SHA
    ad07171 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8d200d3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ca5fa4a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    de8cce4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c62eb92 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3f022b2 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    94118fc View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    21217e9 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    5ddefc5 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2020

  1. Configuration menu
    Copy the full SHA
    5050a3e View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2020

  1. Merge branch 'master' into expressions

    # Conflicts:
    #	janis_core/types/selectors.py
    #	janis_core/utils/__init__.py
    #	janis_core/workflow/workflow.py
    illusional committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    31323a7 View commit details
    Browse the repository at this point in the history
  2. Remove first_element legacy arg from WildcardSelector

    # Conflicts:
    #	janis_core/types/selectors.py
    illusional committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    c9be341 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2020

  1. Configuration menu
    Copy the full SHA
    91a79ba View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4b93477 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c53b578 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    500687c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a4fd11b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    05f59ae View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    7ac72f0 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    9ec9efc View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    6bb52e1 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    ff3f069 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    a81992c View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    bf11886 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    d61a4a9 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    84c179b View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    28e9ffa View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    1a53fc4 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    a232ad6 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    a264a1d View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    a1625d9 View commit details
    Browse the repository at this point in the history
  20. Fix tests

    illusional committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    b5be655 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2020

  1. Configuration menu
    Copy the full SHA
    e8f68c8 View commit details
    Browse the repository at this point in the history
  2. Modify StepTagInput to use selector instead of step node + string

    Move scatter logic into Selector
    illusional committed Mar 27, 2020
    Configuration menu
    Copy the full SHA
    2c2bf7f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4047c73 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1c7ea12 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    860399e View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. Configuration menu
    Copy the full SHA
    ec211b8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4932e65 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4c6443d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e0db160 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2020

  1. Add cwlformatter to deps

    illusional committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    34e0c83 View commit details
    Browse the repository at this point in the history
  2. Add transform operator

    illusional committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    e73dbb2 View commit details
    Browse the repository at this point in the history
  3. Add transform operator

    illusional committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    9d24e6b View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2020

  1. Configuration menu
    Copy the full SHA
    83bfac2 View commit details
    Browse the repository at this point in the history
  2. Add IfThisOrElse operator

    illusional committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    5f8a30e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0d94b6a View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2020

  1. Configuration menu
    Copy the full SHA
    93a37cf View commit details
    Browse the repository at this point in the history
  2. Cleanup minor log entry

    illusional committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    84e2f22 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e2b0bc7 View commit details
    Browse the repository at this point in the history
  4. Cleanup add wrt. string formatters

    Added some different overrides for to_string_formatter,
    though I do intend to deprecate this method
    illusional committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    c812955 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0872da7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3410b0e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    9ebd5c0 View commit details
    Browse the repository at this point in the history
  8. Add "IsDefined" operator

    illusional committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    ccf6627 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    f278320 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    22d5a69 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    e57f3ec View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    9945eac View commit details
    Browse the repository at this point in the history
  13. Merge branch 'master' into expressions

    # Conflicts:
    #	janis_core/workflow/workflow.py
    illusional committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    0937ebc View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2020

  1. Configuration menu
    Copy the full SHA
    3c41be6 View commit details
    Browse the repository at this point in the history
  2. Attempt new WDL implementation for output expressions

    This has increased the complexity again, but I think I've simplified the process
    for collecting the secondary files. There are cases I don't know how to handle
    yet, but still working on them.
    illusional committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    aa7fe2c View commit details
    Browse the repository at this point in the history
  3. Start to fix tests

    illusional committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    5f777dd View commit details
    Browse the repository at this point in the history
  4. Fix test_workflow tests

    illusional committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    b174ee7 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1fb5be2 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b8bb37a View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    aa91820 View commit details
    Browse the repository at this point in the history
  8. Rewrite WDL's translation of step node (big change)

    Golly gosh this was a hard one, but I got it. Condensed the scattering and secondary logic into a shorter,
    much more succinct block that still passes all the tests (so far).
    
    Really, it was ensuring that the values are unwrapped correctly (essentially replace dotted_source with
    `unwrap_expression` (as the input / stepoutput selectors are handled there) and rely on earlier Janis
    checks to prohibit expressions when secondary files are involved.
    illusional committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    20cfe0a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    f8839a7 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2020

  1. Configuration menu
    Copy the full SHA
    0f378a9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e6dae88 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    aea5e47 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    367362f View commit details
    Browse the repository at this point in the history
  5. Feature parity with WDL

    illusional committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    aeedbf5 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ba43366 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    29e2fbd View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    2a93a5b View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    f060d1f View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2020

  1. Configuration menu
    Copy the full SHA
    8e252c4 View commit details
    Browse the repository at this point in the history
  2. Add basic abstract methods for StringFormatter (even though currently…

    … it's stsrictly not an operator)
    illusional committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    d97b042 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    47a4640 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    66c3b4f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d63deb3 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    27759f1 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a1b6e71 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    1e9e04f View commit details
    Browse the repository at this point in the history
  9. Partly introduce JoinOperator

    Waiting on openwdl/wdl#362 for more
    information about how to join(array, "sep") in WDL command block.
    illusional committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    cbe5a4a View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    aab1b02 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    b8a82b5 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2020

  1. Fix tests from next commit

    illusional committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    56cfd48 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2018d7e View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2020

  1. Merge branch 'master' into expressions

    # Conflicts:
    #	janis_core/tests/test_translation_cwl.py
    #	janis_core/tests/test_translation_wdl.py
    #	janis_core/translations/cwl.py
    #	janis_core/translations/translationbase.py
    #	janis_core/translations/wdl.py
    #	janis_core/utils/__init__.py
    illusional committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    495eb47 View commit details
    Browse the repository at this point in the history
  2. Add workflow input default expression to WDL

    Still a bit more complicated for CWL
    illusional committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    4c92c01 View commit details
    Browse the repository at this point in the history
  3. Fix tests

    illusional committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    df66181 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2020

  1. Configuration menu
    Copy the full SHA
    073110b View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into expressions

    # Conflicts:
    #	janis_core/tool/commandtool.py
    illusional committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    6d0b6ba View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d754cbe View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6a6f0cf View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2020

  1. Fix quoting in WDL

    illusional committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    53ab9b9 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2020

  1. Merge branch 'master' into expressions

    # Conflicts:
    #	janis_core/tests/test_translation_cwl.py
    #	janis_core/tests/test_translation_wdl.py
    #	janis_core/tests/testtools.py
    #	janis_core/translations/cwl.py
    #	janis_core/translations/wdl.py
    #	janis_core/types/common_data_types.py
    illusional committed May 1, 2020
    Configuration menu
    Copy the full SHA
    19a1449 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c2aa0f1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ee1d2f4 View commit details
    Browse the repository at this point in the history
  4. Try again lol

    illusional committed May 1, 2020
    Configuration menu
    Copy the full SHA
    441930c View commit details
    Browse the repository at this point in the history
  5. Fix selectfirst

    illusional committed May 1, 2020
    Configuration menu
    Copy the full SHA
    308da54 View commit details
    Browse the repository at this point in the history
  6. Add more checks for WDL

    illusional committed May 1, 2020
    Configuration menu
    Copy the full SHA
    65410ff View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d1dfe95 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2020

  1. Configuration menu
    Copy the full SHA
    755fd7f View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into expressions

    # Conflicts:
    #	janis_core/translations/wdl.py
    #	janis_core/types/common_data_types.py
    illusional committed May 6, 2020
    Configuration menu
    Copy the full SHA
    8cb82cc View commit details
    Browse the repository at this point in the history

Commits on May 7, 2020

  1. Merge branch 'master' into expressions

    # Conflicts:
    #	janis_core/translations/wdl.py
    #	janis_core/types/common_data_types.py
    illusional committed May 7, 2020
    Configuration menu
    Copy the full SHA
    67ff1ad View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bea0d46 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b71d4bc View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    840b5c5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fd12702 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    77d2b8a View commit details
    Browse the repository at this point in the history
  7. Fix pythontool test

    illusional committed May 7, 2020
    Configuration menu
    Copy the full SHA
    cb1e87a View commit details
    Browse the repository at this point in the history
  8. Merge branch 'master' into expressions

    # Conflicts:
    #	janis_core/translations/cwl.py
    illusional committed May 7, 2020
    Configuration menu
    Copy the full SHA
    c4d38ee View commit details
    Browse the repository at this point in the history

Commits on May 8, 2020

  1. Configuration menu
    Copy the full SHA
    0646a06 View commit details
    Browse the repository at this point in the history
  2. Introduce more operators

    illusional committed May 8, 2020
    Configuration menu
    Copy the full SHA
    6436995 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2020

  1. Fix a whole bunch of test that started breaking

    They should've been breaking before...
    illusional committed May 11, 2020
    Configuration menu
    Copy the full SHA
    690d8e3 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2020

  1. Merge branch 'master' into expressions

    # Conflicts:
    #	janis_core/tests/test_translation_wdl.py
    #	janis_core/translations/cwl.py
    #	janis_core/translations/wdl.py
    #	setup.py
    illusional committed May 18, 2020
    Configuration menu
    Copy the full SHA
    e497f95 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2020

  1. Remove traceback logging

    illusional committed May 19, 2020
    Configuration menu
    Copy the full SHA
    a16abcb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9033fee View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. Configuration menu
    Copy the full SHA
    bff49ee View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3d7c621 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2020

  1. Merge branch 'master' into expressions

    # Conflicts:
    #	janis_core/tests/test_translation_cwl.py
    illusional committed May 21, 2020
    Configuration menu
    Copy the full SHA
    fb34585 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2020

  1. Merge branch 'master' into expressions

    # Conflicts:
    #	janis_core/graph/steptaginput.py
    #	janis_core/tests/test_translation_cwl.py
    #	janis_core/tests/test_translation_wdl.py
    #	janis_core/translations/cwl.py
    #	janis_core/translations/wdl.py
    #	janis_core/workflow/workflow.py
    #	setup.py
    illusional committed May 26, 2020
    Configuration menu
    Copy the full SHA
    53b6d49 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5c65ad3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    872962c View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. Configuration menu
    Copy the full SHA
    6cd0646 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0d575d2 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2020

  1. Merge branch 'master' into expressions

    # Conflicts:
    #	janis_core/tool/commandtool.py
    #	janis_core/translations/cwl.py
    illusional committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    188b74f View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2020

  1. Configuration menu
    Copy the full SHA
    05edbee View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2020

  1. Configuration menu
    Copy the full SHA
    85f04d5 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2020

  1. Configuration menu
    Copy the full SHA
    caba870 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2020

  1. Add ReadContentsOperator for WDL

    (implementation for CWL still in testing)
    illusional committed Jun 10, 2020
    Configuration menu
    Copy the full SHA
    a8d7a0e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4a68d9c View commit details
    Browse the repository at this point in the history