Skip to content

Conversation

@marqh
Copy link
Member

@marqh marqh commented May 22, 2019

translation updates from metarelate

@marqh
Copy link
Member Author

marqh commented May 22, 2019

This PR only updates 1 translation, where a previously used long name has finally been accepted as a standard name

the test failures are clustered in
iris.tests.test_plot.TestPlotCitation

It's not clear to me whether this is triggered by a use of this name string in a plot test, or is due to other factors

I don't know how to fix up this PR such that the tests pass, so a little help would be appreciated

@marqh marqh requested a review from pp-mo May 22, 2019 13:25
@ajdawson
Copy link
Member

Those image test failures are not related to your change @marqh, the images differ on axis labels, and in any case are just dummy plots that display a lorem ipsum type text in a citation box. There is no action on you to resolve this.

@pp-mo pp-mo added this to the v2.3.0 milestone May 23, 2019
Copy link
Member

@pp-mo pp-mo left a comment

Choose a reason for hiding this comment

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

Results look fine to me.
I also agree that you can ignore the image hash errors.

However...

  • I think the HEADER/GRIB_HEADER changes can usefully be reverted
    • I think that also fixes the code style (stickler bot) error
  • gen_translations.py has got a licence header (year number) issue

@marqh
Copy link
Member Author

marqh commented May 23, 2019

commit added addressing review comments @pp-mo

@pp-mo
Copy link
Member

pp-mo commented May 23, 2019

gen_translations.py still needs the licence header year number updating.
I think that is all that remains, though.
Otherwise all good, 👍

@marqh
Copy link
Member Author

marqh commented Jun 3, 2019

Hi @pp-mo

apologies for the slapdash quick change before dashing off on leave

i've updated the import and license header as advised

mark

@lbdreyer
Copy link
Member

The travis tests are currently not passing:

IOError: One or more of the files specified did not exist:

    * "/home/travis/build/SciTools/iris/iris-test-data/test_data/FF/landsea_masked/testdata_mini_lsm.ff" didn't match any fil

but it looks like that has been added to iris-test-data: https://github.com/SciTools/iris-test-data/pull/52/files

I will respin the tests to see if they pick up the latest iris-test-data

@lbdreyer
Copy link
Member

lbdreyer commented Aug 20, 2019

@marqh I think this needs to be be rebase - the travis.yml points at a specific iris-test-data commit and this was updated after this PR was raised. Unfortunately I can't push changes to your branch so I'm going to have to leave it up to you.

Do you mind rebasing?

@pp-mo pp-mo assigned marqh and unassigned pp-mo Aug 23, 2019
@marqh
Copy link
Member Author

marqh commented Sep 2, 2019

I think this needs to be be rebase - the travis.yml points at a specific iris-test-data commit and this was updated after this PR was raised. Unfortunately I can't push changes to your branch so I'm going to have to leave it up to you.

Do you mind rebasing?

@lbdreyer rebased; I hope this is enough

@lbdreyer
Copy link
Member

lbdreyer commented Sep 2, 2019

Brilliant! Thanks @marqh !

This looks good to go

@lbdreyer lbdreyer merged commit e69b81b into SciTools:master Sep 2, 2019
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.

6 participants