Skip to content

Commit

Permalink
fixed: from_queue usage pattern
Browse files Browse the repository at this point in the history
  • Loading branch information
@iromeo
iromeo committed Oct 21, 2024
1 parent b68d52d commit 2c7b52c
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 34 deletions.
2 changes: 1 addition & 1 deletion snakemake_api.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ changelog:
type: "function"
placeholders_injection_allowed: True
limit_to_sections:
- "output"
- "input"

# ---------------------------------------
- version: "8.0.0"
Expand Down
68 changes: 35 additions & 33 deletions ...sources/features/highlighting/inspections/misuse_usage_io_flag_methods_inspection.feature
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Feature: Inspection for methods from snakemake library

Scenario Outline: Incorrect using ancient/protected/directory methods in 8.7.0
Scenario Outline: Incorrect using flag methods in 8.7.0
Given a snakemake project
And I set snakemake language version to "8.7.0"
Given I open a file "foo.smk" with text
Expand All @@ -15,10 +15,11 @@ Feature: Inspection for methods from snakemake library
"""
When I check highlighting warnings
Examples:
| rule_like | section | method | arg_list | expected |
| rule | input | update | ('') | 'output' |
| rule_like | section | method | arg_list | expected |
| rule | input | update | ('') | 'output' |
| rule | output | from_queue | ('') | 'input' |

Scenario Outline: Incorrect using ancient/protected/directory methods
Scenario Outline: Incorrect using flag methods
Given a snakemake project
Given I open a file "foo.smk" with text
"""
Expand Down Expand Up @@ -56,7 +57,7 @@ Feature: Inspection for methods from snakemake library
| rule | input | dynamic | ('') | 'output' |
| checkpoint | input | dynamic | ('') | 'output' |

Scenario Outline: Incorrect using ancient/protected/directory methods before 8.0
Scenario Outline: Incorrect using flag methods before 8.0
# dynamic was removed in 8.0 and feature is based on resolve

Given a snakemake:7.32.4 project
Expand All @@ -76,7 +77,7 @@ Feature: Inspection for methods from snakemake library
| rule | input | dynamic | ('') | 'output' |
| checkpoint | input | dynamic | ('') | 'output' |

Scenario Outline: Correct using ancient/protected/directory methods
Scenario Outline: Correct using flag methods
Given a snakemake project
Given I open a file "foo.smk" with text
"""
Expand All @@ -87,33 +88,34 @@ Feature: Inspection for methods from snakemake library
Then I expect no inspection warnings
When I check highlighting warnings
Examples:
| rule_like | section | method |
| rule | input | ancient('') |
| rule | output | temp('') |
| rule | input | unpack('') |
| rule | output | directory('') |
| rule | output | pipe('') |
| rule | output | protected('') |
| rule | output | dynamic('') |
| rule | output | touch('') |
| rule | output | ensure('') |
| rule | log | touch('') |
| rule | benchmark | touch('') |
| rule | output | report('') |
| rule | benchmark | repeat('') |
| rule | benchmark | protected('') |
| rule | output | update('') |
| checkpoint | input | ancient('') |
| checkpoint | output | temporary('') |
| checkpoint | input | unpack('') |
| checkpoint | output | directory('') |
| checkpoint | output | pipe('') |
| checkpoint | output | protected('') |
| checkpoint | output | dynamic('') |
| checkpoint | output | touch('') |
| checkpoint | output | report('') |
| checkpoint | benchmark | repeat('') |
| checkpoint | benchmark | protected('') |
| rule_like | section | method |
| rule | input | ancient('') |
| rule | output | temp('') |
| rule | input | unpack('') |
| rule | input | from_queue('') |
| rule | output | directory('') |
| rule | output | pipe('') |
| rule | output | protected('') |
| rule | output | dynamic('') |
| rule | output | touch('') |
| rule | output | ensure('') |
| rule | log | touch('') |
| rule | benchmark | touch('') |
| rule | output | report('') |
| rule | benchmark | repeat('') |
| rule | benchmark | protected('') |
| rule | output | update('') |
| checkpoint | input | ancient('') |
| checkpoint | output | temporary('') |
| checkpoint | input | unpack('') |
| checkpoint | output | directory('') |
| checkpoint | output | pipe('') |
| checkpoint | output | protected('') |
| checkpoint | output | dynamic('') |
| checkpoint | output | touch('') |
| checkpoint | output | report('') |
| checkpoint | benchmark | repeat('') |
| checkpoint | benchmark | protected('') |


Scenario Outline: Complex cases not be confused
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/features/resolve/implicit_py_symbols_resolve.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ Feature: Resolve implicitly imported python names
| snakemake | pro | protected() | protected | io.py |
| snakemake | upd | update() | update | ioflags.py |
| snakemake | bef | before_update() | before_update | ioflags.py |
| snakemake | fr | from_queue() | from_queue | io.py |
| snakemake | tou | touch() | touch | io.py |
| snakemake | un | unpack() | unpack | io.py |
| snakemake | anc | ancient() | ancient | io.py |
Expand Down

0 comments on commit 2c7b52c

Please sign in to comment.