Skip to content

Pytest 3.2.0 compatibility fixes for 2.0.x - #6430

Merged
bsipocz merged 2 commits into
astropy:v2.0.xfrom
bsipocz:pytest_3.2.0_compatibility_for_2.0.x
Aug 8, 2017
Merged

Pytest 3.2.0 compatibility fixes for 2.0.x#6430
bsipocz merged 2 commits into
astropy:v2.0.xfrom
bsipocz:pytest_3.2.0_compatibility_for_2.0.x

Conversation

@bsipocz

@bsipocz bsipocz commented Aug 8, 2017

Copy link
Copy Markdown
Member

This PR is opened against the bugfix branch to serve as a backport of #6423 (as the tests module got refactored significantly in master). The PR also contains workarounds for the parametrized tests as discussed in #6419 (comment).

bsipocz added 2 commits August 8, 2017 16:08
@bsipocz
Backport astropy#6423.
a1f86c4
@bsipocz
Workaround of upcoming changes of pytest.mark.parametrize to handle d…
187ec78 
…irect marking of parameters. Bug fix branch counterpart of astropy#6419 to keep supporting pytest <3.1
@bsipocz bsipocz added the testing label Aug 8, 2017
@bsipocz bsipocz added this to the v2.0.2 milestone Aug 8, 2017
@bsipocz
bsipocz requested review from astrofrog and mhvk August 8, 2017 15:14
@astropy-bot

astropy-bot Bot commented Aug 8, 2017 •
edited
Loading

Copy link
Copy Markdown

Hi there @bsipocz 👋 - thanks for the pull request! I'm just a friendly 🤖 that checks for issues related to the changelog and making sure that this pull request is milestoned and labelled correctly. This is mainly intended for the maintainers, so if you are not a maintainer you can ignore this, and a maintainer will let you know if any action is required on your part 😃.

Everything looks good from my point of view! 👍

@bsipocz bsipocz mentioned this pull request Aug 8, 2017
Merged
astrofrog
astrofrog reviewed Aug 8, 2017
View reviewed changes

@astrofrog astrofrog left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good to me provided that tests pass. I think for the consistency checks you might want to set the milestone of the original PR to v3.0? (otherwise it will complain it wasn't backported?)

@bsipocz

bsipocz commented Aug 8, 2017 •
edited
Loading

Copy link
Copy Markdown
Member Author

@astrofrog - I've though that we rather need to list it in MANUAL_MERGES. If we remilestone, then it would complain about the changelog or will be double listed.

Alternatively I could backport it and manually deal with the mess to edit out the conflict to have the exact same net change as here.

Either way, I don't mind.

@astrofrog

astrofrog commented Aug 8, 2017

Copy link
Copy Markdown
Member

Ah yes that's fine, I forgot how I dealt with it before

mhvk
mhvk approved these changes Aug 8, 2017
View reviewed changes

@mhvk mhvk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

All looks good to me.

@bsipocz

bsipocz commented Aug 8, 2017

Copy link
Copy Markdown
Member Author

I'm merging as travis failures are unrelated urlerrors due to timeouts.

@bsipocz
bsipocz merged commit ddefacb into astropy:v2.0.x Aug 8, 2017
@bsipocz bsipocz mentioned this pull request Feb 2, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@astrofrog astrofrog astrofrog approved these changes
@mhvk mhvk mhvk approved these changes

Assignees

No one assigned

Labels

testing

Projects

None yet

Milestone

v2.0.2

Development

Successfully merging this pull request may close these issues.

3 participants

@bsipocz @astrofrog @mhvk