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

cylc clean 3: targeted clean #4237

Merged
merged 22 commits into from
Jun 29, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
988648f
Type annotations
MetRonnie Mar 30, 2021
506bb38
cylc clean: add --remote-only option
MetRonnie Mar 31, 2021
eacdcce
Fix & refactor cylc clean unit tests
MetRonnie Mar 31, 2021
a037073
cylc clean: Implement targeted clean
MetRonnie Apr 7, 2021
505b27b
Fix error when share/cycle sylink dir same as share
MetRonnie Apr 13, 2021
262126e
Allow symlink dirs in global config to be unset
MetRonnie Apr 13, 2021
b02d74f
Fix #4133 - better error handling when rmtree fails
MetRonnie Apr 22, 2021
7e0ee50
Tidy
MetRonnie Apr 29, 2021
fa112a2
cylc clean: Fix deletion of symlink dir targets in targeted clean
MetRonnie Apr 26, 2021
4581158
cylc clean: overhaul targeted clean to make globs work
MetRonnie Jun 1, 2021
2268f20
Refactor cylc clean test into fixture
MetRonnie Jun 1, 2021
d7a9f82
cylc clean: Fix tidying of empty run dir parents
MetRonnie Jun 2, 2021
634109b
cylc clean: add help examples
MetRonnie Jun 2, 2021
a2fcaea
Remote clean: iterate over proc queue more elegantly
MetRonnie Jun 4, 2021
6eb3500
Update changelog
MetRonnie Jun 4, 2021
82ec437
Address code review
MetRonnie Jun 9, 2021
2300f4d
Targeted clean: Overhaul processing of glob results
MetRonnie Jun 9, 2021
011e6e0
Move glob_run_dir() to workflow_files
MetRonnie Jun 11, 2021
3a44181
Merge branch 'master' into cylc-clean
MetRonnie Jun 21, 2021
2dc0f0d
Fix small mistake
MetRonnie Jun 21, 2021
4f23670
Fix test failures
MetRonnie Jun 21, 2021
fadda2a
Remote clean: only re-run on different platform if SSH failed (255)
MetRonnie Jun 23, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/unit/test_pathutil.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
remove_dir_or_file
)

from tests.unit.conftest import MonkeyMock
Copy link
Member Author

@MetRonnie MetRonnie Jun 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Anyone know why this import stopped working suddenly on GH Actions? The absolute import is still working locally for me

_________________ ERROR collecting tests/unit/test_pathutil.py _________________
tests/unit/test_pathutil.py:47: in <module>
    from tests.unit.conftest import MonkeyMock
E   ModuleNotFoundError: No module named 'tests'

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be the difference between the editable install you will likely have for local development and the regular install on GH actions. I think the editable install will put the tests folder in PYTHONPATH.

The tests folder shouldn't be imported directly like that (hasn't been configured as a Python package, has no __init__.py so will be interpreted as a namespace package?).

from .conftest import MonkeyMock


HOME = Path.home()
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/test_workflow_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
search_install_source_dirs
)

from tests.unit.conftest import MonkeyMock
from tests.unit.filetree import (
from .conftest import MonkeyMock
from .filetree import (
FILETREE_1,
FILETREE_2,
FILETREE_3,
Expand Down