Skip to content

TST: lift xfail from tests fixed upstream in matplotlib#11315

Merged
pllim merged 2 commits intoastropy:masterfrom
lpsinger:try-mpl-dev-fix
Feb 19, 2021
Merged

TST: lift xfail from tests fixed upstream in matplotlib#11315
pllim merged 2 commits intoastropy:masterfrom
lpsinger:try-mpl-dev-fix

Conversation

@lpsinger
Copy link
Copy Markdown
Contributor

@lpsinger lpsinger commented Feb 9, 2021

Lift xfail from tests fixed upstream in matplotlib.

Fixes #11267.

@lpsinger
Copy link
Copy Markdown
Contributor Author

lpsinger commented Feb 9, 2021

Please note that this is a draft and includes a temporary change to tox.ini to try building against @tacaswell's branch.

@pllim pllim marked this pull request as draft February 9, 2021 18:53
@pllim pllim added this to the v4.3 milestone Feb 9, 2021
@pllim
Copy link
Copy Markdown
Member

pllim commented Feb 9, 2021

Thanks! I converted this PR to draft status for now, as indicated.

@lpsinger
Copy link
Copy Markdown
Contributor Author

lpsinger commented Feb 9, 2021

@pllim, did I revert the correct changes from #11292? Looks like that PR might have been addressing two unrelated Matplotlib issues...

@pllim
Copy link
Copy Markdown
Member

pllim commented Feb 9, 2021

Re: Not sure what happened but seems like you reverted too much? All you need is to delete the lines added in the final diff of https://github.com/astropy/astropy/pull/11292/files

@lpsinger
Copy link
Copy Markdown
Contributor Author

lpsinger commented Feb 9, 2021

The tests were failing, and I noticed that @tacaswell's branch was well behind master, so I thought I would try reverting more. I'll go back to just removing those two xfail markers, but then I'll need to rebase his branch in order to test it.

@lpsinger
Copy link
Copy Markdown
Contributor Author

lpsinger commented Feb 9, 2021

It's failing with a whole bunch of 404 errors when it tries to download baseline images...
https://app.circleci.com/pipelines/github/astropy/astropy/4017/workflows/9d0697fe-5cf6-410e-b392-aa62b10ce629/jobs/84521

Is some piece of infrastructure down at the moment?

@pllim

This comment has been minimized.

@pllim
Copy link
Copy Markdown
Member

pllim commented Feb 9, 2021

Does matplotlib use setuptools_scm now? If so, maybe because your fork doesn't have the tags necessary to build the correct version number?

@lpsinger
Copy link
Copy Markdown
Contributor Author

lpsinger commented Feb 9, 2021

Interesting thought. I pushed the tags to my fork, then try again.

@pllim
Copy link
Copy Markdown
Member

pllim commented Feb 9, 2021

mpldev is green! 👏

@lpsinger
Copy link
Copy Markdown
Contributor Author

lpsinger commented Feb 9, 2021

Woot! OK, I'll report back to Matplotlib that this fix will work for us.

@tacaswell
Copy link
Copy Markdown

Does matplotlib use setuptools_scm now? If so, maybe because your fork doesn't have the tags necessary to build the correct version number?

No, but we are working on switching: matplotlib/matplotlib#18971 currently we use versioneer.

I re-worked my mpl PR, is there an easy way to re-trigger this CI work?

@lpsinger
Copy link
Copy Markdown
Contributor Author

I re-worked my mpl PR, is there an easy way to re-trigger this CI work?

You mean astropy's? Please rebase against master and push all of matplotlib's version tags to your fork. Then I can trigger it.

@lpsinger lpsinger force-pushed the try-mpl-dev-fix branch 3 times, most recently from 07e6bea to d056470 Compare February 11, 2021 14:40
@tacaswell
Copy link
Copy Markdown

Done. I have to pushed tags to my fork in a very long time (it pushed 1.5.2 on 🤣 ) .

@lpsinger
Copy link
Copy Markdown
Contributor Author

I triggered a build a little while ago, before you had pushed the latest tag, by pushing your branch to my fork. It's still passing :-)

@lpsinger lpsinger force-pushed the try-mpl-dev-fix branch 3 times, most recently from 961226c to f2163d3 Compare February 19, 2021 01:06
@lpsinger lpsinger marked this pull request as ready for review February 19, 2021 01:06
@lpsinger lpsinger changed the title DRAFT: TST: lift xfail from tests fixed upstream in matplotlib TST: lift xfail from tests fixed upstream in matplotlib Feb 19, 2021
@lpsinger
Copy link
Copy Markdown
Contributor Author

matplotlib/matplotlib#19438 is in now, so this is ready for review.

@pllim
Copy link
Copy Markdown
Member

pllim commented Feb 19, 2021

Thanks! Remote failure unrelated and you can ignore coverage complain.

Before I get this in, can you please remove MATPLOTLIB_DEV altogether? I don't think it is used anymore.

Copy link
Copy Markdown
Member

@pllim pllim left a comment

Choose a reason for hiding this comment

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

Perfect. Thanks!

I'll cancel Actions as it is not needed. As soon as mpldev passes, I will merge. 😄

@pllim pllim merged commit e512426 into astropy:master Feb 19, 2021
@lpsinger lpsinger deleted the try-mpl-dev-fix branch February 19, 2021 15:01
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.

TST: mpl-dev job, test_misc.py failing

3 participants