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

Merge features into master #5491

Merged
merged 5 commits into from
Jun 25, 2019

Conversation

nicoddemus
Copy link
Member

Didn't realize @Zac-HD's last PR was targeting features.

@Zac-HD we didn't really announce it anywhere (sorry), but we will work only on master until 5.0 is released, because the py27/py34 support drop happened on master.

After 5.0 gets released, it is business as usual regarding master/features. 👍

Copy link
Member

@asottile asottile left a comment

Choose a reason for hiding this comment

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

@@ -105,7 +105,7 @@ def changelog(version, write_out=False):

def main():
init(autoreset=True)
parser = argparse.ArgumentParser()
parser = argparse.ArgumentParser(allow_abbrev=False)
Copy link
Member

Choose a reason for hiding this comment

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

idk why we changed this in this file, there's no plugins involved here and prefix matching is actually kind of a nice feature

Copy link
Member Author

Choose a reason for hiding this comment

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

See the mentioned issues for the problems that prefix matching brings, namely that we can't know that a prefix matches a given option during preparsing, because later on plugins might register options that actually match the option given by the user.

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh but you got a point about changing it in this file, here doesn't really hurt. 😁

Copy link
Member

Choose a reason for hiding this comment

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

to be clear, I agree with the change in pytest proper, just not in these helper scripts

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, I understand and agree. 👍

Copy link
Member

Choose a reason for hiding this comment

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

ok if I add a commit to this PR which undoes those two?

Copy link
Member

Choose a reason for hiding this comment

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

Fine by me!

@@ -74,7 +74,7 @@ def report(issues):
if __name__ == "__main__":
import argparse

parser = argparse.ArgumentParser("process bitbucket issues")
parser = argparse.ArgumentParser("process bitbucket issues", allow_abbrev=False)
Copy link
Member

Choose a reason for hiding this comment

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

""

Copy link
Member Author

Choose a reason for hiding this comment

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

Agreed, my bad for not catching this really.

@codecov
Copy link

codecov bot commented Jun 25, 2019

Codecov Report

Merging #5491 into master will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #5491   +/-   ##
=======================================
  Coverage   93.78%   93.78%           
=======================================
  Files         117      117           
  Lines       25550    25550           
  Branches     2473     2473           
=======================================
  Hits        23962    23962           
  Misses       1259     1259           
  Partials      329      329
Impacted Files Coverage Δ
testing/acceptance_test.py 96.42% <ø> (ø) ⬆️
src/_pytest/config/argparsing.py 88.2% <100%> (+0.1%) ⬆️
testing/test_capture.py 97.64% <100%> (ø) ⬆️
testing/test_parseopt.py 94.62% <100%> (-0.05%) ⬇️
testing/test_pastebin.py 100% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 64a6365...bd647fd. Read the comment docs.

@nicoddemus
Copy link
Member Author

nicoddemus commented Jun 25, 2019

Merging as the failure is related to tox, which should have been fixed by now with the 3.13.1 release. 👍

@nicoddemus nicoddemus merged commit 1aefb24 into pytest-dev:master Jun 25, 2019
@nicoddemus nicoddemus deleted the merge-features-into-master branch June 25, 2019 23:02
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.

3 participants