SFilter: fix for external and ignored items

[MichaelSt98]

Fix for #497.

Thanks @reuterbal!

[github-actions]

Documentation for this branch can be viewed at https://sites.ecmwf.int/docs/loki/501/index.html

[reuterbal]

Thanks. The underlying issue was that SFilter skips

• external items, if include_external == False
• ignored items, if exclude_ignored == True

But it did not consider the case that an external item might be marked as ignored and should therefore be skipped.

Would you mind adding the reproducer from #497 as a test for this situation?

[reuterbal]

Suggested change

# if node_cls in as_tuple(self.item_filter) and not (self.exclude_ignored and node.is_ignored):

[codecov]

Codecov Report

Attention: Patch coverage is 96.29630% with 1 line in your changes missing coverage. Please review.

Project coverage is 95.65%. Comparing base (57e4204) to head (2510e71).
Report is 2 commits behind head on main.

Files with missing lines	Patch %	Lines
loki/batch/tests/test_scheduler.py	95.45%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #501      +/-   ##
==========================================
- Coverage   95.65%   95.65%   -0.01%     
==========================================
  Files         224      224              
  Lines       40783    40805      +22     
==========================================
+ Hits        39013    39034      +21     
- Misses       1770     1771       +1     

Flag	Coverage Δ
lint_rules	96.39% <ø> (ø)
loki	95.64% <96.29%> (-0.01%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[reuterbal]

Many thanks, GTG!