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

2to3 tutorial #2310

Merged
merged 5 commits into from
Apr 8, 2019
Merged

Conversation

oliver-sanders
Copy link
Member

@oliver-sanders oliver-sanders commented Mar 13, 2019

Convert the Rose/Cylc tutorial suites to Python3

  • 2to3.
  • Drop the bundled py2 lib png.py, replace with pillow (new dependency).
  • Use the new next() mechanism to set initial and final cycle points.

The related test is t/docs/02-tutorial-suites.t which should pass with three skips.

@oliver-sanders oliver-sanders added this to the next-feature milestone Mar 13, 2019
@oliver-sanders oliver-sanders self-assigned this Mar 13, 2019
@matthewrmshin matthewrmshin added this to In progress in 2to3 via automation Mar 14, 2019
@oliver-sanders
Copy link
Member Author

oliver-sanders commented Mar 21, 2019

On hold until test fixed (cannot replicate TravisCI test failure locally).

Tests passing, good to go.

Copy link
Contributor

@wxtim wxtim left a comment

Choose a reason for hiding this comment

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

I've made some comments, but none of them are fatal objections to this PR.

Copy link
Contributor

@sadielbartholomew sadielbartholomew left a comment

Choose a reason for hiding this comment

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

Great!

  • Docs still build cleanly;
  • check-software still works, with new appropriate section & my installed pillow library found;
  • The tweaked tutorial suites making use of the Relative ICP feature (under Python 3 via the Cylc 8 master branch) run as they should, & have the correct ICP & FCP;
  • The relevant docs sections still make sense by eyeball with the new ICP-setting method.

etc/tutorial/cylc-forecasting-suite/.validate Show resolved Hide resolved
This sets the :term:`final cycle point` six hours after the
:term:`initial cycle point`.

Run `cylc validate` to check for any errors::
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Run `cylc validate` to check for any errors::
Run ``cylc validate`` to check for any errors::

Copy link
Member Author

Choose a reason for hiding this comment

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

Good spot! I'll try to note this for a future fix. I wish there was a way to get Sphinx to raise errors for things like this. We might be able to write a custom role or something of that ilk...

@sadielbartholomew sadielbartholomew merged commit 581fdf2 into metomi:master Apr 8, 2019
2to3 automation moved this from In progress to Done Apr 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
2to3
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants