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

Rephrase cycle time to cycle point #1323

Merged
merged 6 commits into from
Aug 8, 2014

Conversation

matthewrmshin
Copy link
Member

Rephrase cycle time to cycle point for cylc 6.
Improve reporting of running cylc processes.

Now that cylc/cylc-flow#996 is closed, we need this for Rose to work correctly.

@matthewrmshin matthewrmshin added this to the next-release milestone Jul 3, 2014
@matthewrmshin matthewrmshin self-assigned this Jul 3, 2014
@matthewrmshin matthewrmshin changed the title Rephrase *cycle time* to *cycle point* Rephrase cycle time to cycle point Jul 3, 2014
Fix tests for cylc 6.
When checking whether a suite is running or not, allow reasons to
contain all lines of the `pgrep` command.
Simply return `TimePoint` object if format string is `None`.
@matthewrmshin
Copy link
Member Author

@benfitzpatrick please review.

if "%" in print_format:
if print_format is None:
return str(time_point)
if print_format and "%" in print_format:
Copy link
Contributor

Choose a reason for hiding this comment

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

First part of the if isn't necessary here, I think.

@matthewrmshin
Copy link
Member Author

Fixed unnecessary if syntax.

I have also fixed some unnecessary Z syntax in the Rose Bush templates. This is to assume that cylc is now storing date time with time zone information.

@benfitzpatrick
Copy link
Contributor

This is to assume that cylc is now storing date time with time zone information.

This is always supposed to be true now.

benfitzpatrick added a commit that referenced this pull request Aug 8, 2014
@benfitzpatrick benfitzpatrick merged commit e8093f2 into metomi:master Aug 8, 2014
@matthewrmshin matthewrmshin deleted the fix-t-for-cylc-6 branch August 8, 2014 13:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants