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

#981: final cycle specification as an offset. #1055

Merged
merged 6 commits into from
Aug 6, 2014

Conversation

arjclark
Copy link
Contributor

@arjclark arjclark commented Aug 4, 2014

Closes #981

@arjclark
Copy link
Contributor Author

arjclark commented Aug 4, 2014

@benfitzpatrick - please review.

@arjclark arjclark added this to the cylc-6 milestone Aug 4, 2014
@arjclark arjclark changed the title #119: final cycle specification as an offset. #981: final cycle specification as an offset. Aug 4, 2014
def _coerce_final_cycletime( value, keys, args ):
"""Coerce final cycle point."""
value = _strip_and_unquote( keys, value )
if "P" in str(value):
Copy link
Contributor

Choose a reason for hiding this comment

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

Would a value of T06 pass this coercer?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No - should it? I'm not seeing any failures of existing examples of this in the test battery and I've only been working in terms of +P, as outlined in the documentation changes.

@arjclark
Copy link
Contributor Author

arjclark commented Aug 5, 2014

@benfitzpatrick - feedback addressed, see the above query/comment re. T06.

@arjclark
Copy link
Contributor Author

arjclark commented Aug 5, 2014

Hold off a moment, odd behaviour from the test battery with the feedback changes.

@benfitzpatrick
Copy link
Contributor

We should be able to use expressions like this.

@arjclark
Copy link
Contributor Author

arjclark commented Aug 5, 2014

#1044 is a separate issue though isn't it as it applies to not just this case?

@arjclark
Copy link
Contributor Author

arjclark commented Aug 5, 2014

@benfitzpatrick - done. T06 now covered (and in test battery).

Had to correct a reload test as it hadn't been converted fully to the new syntax.

def _coerce_final_cycletime( value, keys, args ):
"""Coerce final cycle point."""
value = _strip_and_unquote( keys, value )
if "P" in str(value) or str(value).startswith("T"):
Copy link
Contributor

Choose a reason for hiding this comment

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

Unfortunately, this won't pick up values like 01T.

Maybe we just need to avoid testing final cycle point validity here - i.e.
remove this function entirely.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

As discussed I'll strip it down to a bare minimum so we can put back in better functionality once we know what we're doing.

@arjclark
Copy link
Contributor Author

arjclark commented Aug 5, 2014

@benfitzpatrick - done. This should cover everything discussed.

@hjoliver
Copy link
Member

hjoliver commented Aug 6, 2014

Looks good, works. I'm taking this without the final go-ahead from Ben as it is a small change, and I want to get everything on to master before any more pull requests come in.

hjoliver added a commit that referenced this pull request Aug 6, 2014
#981: final cycle specification as an offset.
@hjoliver hjoliver merged commit 6c75b3d into cylc:119.iso8601-cycling Aug 6, 2014
@arjclark arjclark deleted the relative_end_point branch August 6, 2014 08:50
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.

3 participants