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

Reintroduce warnings postponed in 6.0 #7637

Merged
merged 2 commits into from Aug 22, 2020
Merged

Reintroduce warnings postponed in 6.0 #7637

merged 2 commits into from Aug 22, 2020

Conversation

mcsitter
Copy link
Contributor

@mcsitter mcsitter commented Aug 12, 2020

  • Include new tests or update existing tests when applicable.
  • Allow maintainers to push and squash when merging my commits. Please uncheck this if you prefer to squash the commits yourself.
  • Create changelog entries

I came across the comment # Uncomment this after 6.0 release (#7361). Here is my PR for this.
Still working on the changelog text. In deprecated.py there are explanations for the deprecations already. Should I just copy them and shorten where it makes sense?

closes #7361

Copy link
Member

@nicoddemus nicoddemus left a comment

Choose a reason for hiding this comment

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

Thanks a lot @mcsitter for getting to this.

I've dug around the Git history to find the original deprecation messages for those entries, please see my comments. 👍

src/_pytest/fixtures.py Show resolved Hide resolved
src/_pytest/hookspec.py Show resolved Hide resolved
src/_pytest/mark/__init__.py Show resolved Hide resolved
src/pytest/collect.py Show resolved Hide resolved
@The-Compiler
Copy link
Member

I don't understand our deprecation plans here - all deprecations are errors now, even new deprecations we're introducing? In other words, there is no phase where new deprecations are warnings rather than errors?

@nicoddemus
Copy link
Member

I don't understand our deprecation plans here - all deprecations are errors now, even new deprecations we're introducing? In other words, there is no phase where new deprecations are warnings rather than errors?

Yeah I didn't mention, but one of the first things we should do is #5585 and turn back PytestDeprecationWarning into normal warnings, instead of errors.

The-Compiler referenced this pull request Aug 16, 2020
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
@nicoddemus
Copy link
Member

After #7660 gets merged we can rebase this one. 👍

@nicoddemus
Copy link
Member

Hi @mcsitter,

Could you please rebase your PR now that #7660 has been merged? Thanks!

@mcsitter
Copy link
Contributor Author

Will do! I never rebased a branch in a PR. I think I have to 1. pull from upstream master with the rebase flag. Once I learned to 2. deal with merge conflicts, I will 3. push the changes to my fork.

I think a rebase can rewrite history, so i am trying to be careful.

@nicoddemus
Copy link
Member

Will do! I never rebased a branch in a PR. I think I have to 1. pull from upstream master with the rebase flag. Once I learned to 2. deal with merge conflicts, I will 3. push the changes to my fork.

That's pretty much it, yes. Let us know if you run into trouble! Thanks!

I think a rebase can rewrite history, so i am trying to be careful.

You are right, a rebase normally rewrites history, but it is only on your fork so it is alright. 👍

@mcsitter
Copy link
Contributor Author

Rebase done. Thank you for your support! Tests are also passing. This is really delightful 😄

@nicoddemus
Copy link
Member

Looks great! Thanks a lot @mcsitter!

@nicoddemus nicoddemus merged commit 75af2bf into pytest-dev:master Aug 22, 2020
@mcsitter mcsitter deleted the 7361-reintroduce-warnings-postponed branch August 24, 2020 15:58
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.

Reintroduce warnings postponed in 6.0
4 participants