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

Update rosie id to use new JSON format for Cylc VCS logs #2520

Merged
merged 2 commits into from
Dec 10, 2021

Conversation

MetRonnie
Copy link
Contributor

Companion to cylc/cylc-flow#4548 (needs merging first for tests to pass here). Follow-up to #2510.

@MetRonnie MetRonnie added this to the 2.0rc1 milestone Dec 7, 2021
@MetRonnie MetRonnie self-assigned this Dec 7, 2021
@oliver-sanders
Copy link
Member

(merged the sibling PR)

@MetRonnie MetRonnie marked this pull request as ready for review December 8, 2021 16:09
# these cause import issues
--ignore=metomi/rose/etc/
--ignore=metomi/rosie/ws.py
--ignore=metomi/rosie/graph.py
Copy link
Member

Choose a reason for hiding this comment

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

I don't have any import issues here:

Suggested change
--ignore=metomi/rosie/graph.py

Copy link
Contributor Author

@MetRonnie MetRonnie Dec 10, 2021

Choose a reason for hiding this comment

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

Was passing for me locally, but on GH Actions:

=========================== short test summary info ============================
ERROR metomi/rosie/graph.py - ModuleNotFoundError: No module named 'pygraphviz'
ERROR metomi/rosie/ws.py - ModuleNotFoundError: No module named 'tornado'

https://github.com/metomi/rose/runs/4459717007?check_suite_focus=true#step:11:23

Actualy, on second thought, shouldn't we include pygraphviz as a dependency of Rose if it imports it?

Copy link
Member

@oliver-sanders oliver-sanders left a comment

Choose a reason for hiding this comment

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

Looks good.

@oliver-sanders oliver-sanders requested a review from wxtim December 9, 2021 10:27
if url and rev:
location = url + "@" + rev
return location
with open(fpath, 'r') as f:
Copy link
Contributor

Choose a reason for hiding this comment

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

This is why I wanted this!

@wxtim
Copy link
Contributor

wxtim commented Dec 9, 2021

Approved without merging to allow you to respond or not to Oliver's unresolved comment.

@wxtim
Copy link
Contributor

wxtim commented Dec 10, 2021

Actually, IMO we should merge, but create a new issue, or just collar Oliver on Monday.

@MetRonnie
Copy link
Contributor Author

Merging now, created a new issue for pygraphviz here: #2523

@MetRonnie MetRonnie merged commit e505cac into metomi:master Dec 10, 2021
@MetRonnie MetRonnie deleted the suite-id branch December 10, 2021 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants