-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3232 from nicoddemus/merge-upstream
Merge master into features
- Loading branch information
Showing
26 changed files
with
255 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,14 @@ | ||
Thanks for submitting a PR, your contribution is really appreciated! | ||
|
||
Here's a quick checklist that should be present in PRs: | ||
Here's a quick checklist that should be present in PRs (you can delete this text from the final description, this is | ||
just a guideline): | ||
|
||
- [ ] Add a new news fragment into the changelog folder | ||
* name it `$issue_id.$type` for example (588.bugfix) | ||
* if you don't have an issue_id change it to the pr id after creating the pr | ||
* ensure type is one of `removal`, `feature`, `bugfix`, `vendor`, `doc` or `trivial` | ||
* Make sure to use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files." | ||
- [ ] Target: for `bugfix`, `vendor`, `doc` or `trivial` fixes, target `master`; for removals or features target `features`; | ||
- [ ] Make sure to include reasonable tests for your change if necessary | ||
- [ ] Create a new changelog file in the `changelog` folder, with a name like `<ISSUE NUMBER>.<TYPE>.rst`. See [changelog/README.rst](/changelog/README.rst) for details. | ||
- [ ] Target the `master` branch for bug fixes, documentation updates and trivial changes. | ||
- [ ] Target the `features` branch for new features and removals/deprecations. | ||
- [ ] Include documentation when adding new features. | ||
- [ ] Include new tests or update existing tests when applicable. | ||
|
||
Unless your change is a trivial or a documentation fix (e.g., a typo or reword of a small section) please: | ||
Unless your change is trivial or a small documentation fix (e.g., a typo or reword of a small section) please: | ||
|
||
- [ ] Add yourself to `AUTHORS`, in alphabetical order; | ||
- [ ] Add yourself to `AUTHORS` in alphabetical order; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Move import of ``doctest.UnexpectedException`` to top-level to avoid possible errors when using ``--pdb``. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Added printing of captured stdout/stderr before entering pdb, and improved a test which was giving false negatives about output capturing. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Fix ordering of tests using parametrized fixtures which can lead to fixtures being created more than necessary. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Rename ``ParameterSet._for_parameterize()`` to ``_for_parametrize()`` in order to comply with the naming convention. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Fix bug where logging happening at hooks outside of "test run" hooks would cause an internal error. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Add Sphinx parameter docs for ``match`` and ``message`` args to ``pytest.raises``. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Detect arguments injected by ``unittest.mock.patch`` decorator correctly when pypi ``mock.patch`` is installed and imported. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Skip failing pdb/doctest test on mac. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
This directory contains "newsfragments" which are short that contain a small **ReST**-formatted | ||
text that will be added to the next ``CHANGELOG``. | ||
|
||
The ``CHANGELOG`` will be read by users, so this description should be aimed to pytest users | ||
instead of describing internal changes which are only relevant to the developers. | ||
|
||
Make sure to use full sentences with correct case and punctuation, for example: *Fix issue with non-ascii contents in doctest text files.* | ||
|
||
Each file should be named like ``<ISSUE>.<TYPE>.rst``, where | ||
``<ISSUE>`` is an issue number, and ``<TYPE>`` is one of: | ||
|
||
* ``feature``: new user facing features, like new command-line options and new behavior. | ||
* ``bugfix``: fixes a reported bug. | ||
* ``doc``: documentation improvement, like rewording an entire session or adding missing docs. | ||
* ``removal``: feature deprecation or removal. | ||
* ``vendor``: changes in packages vendored in pytest. | ||
* ``trivial``: fixing a small typo or internal change that might be noteworthy. | ||
|
||
So for example: ``123.feature.rst``, ``456.bugfix.rst``. | ||
|
||
If your PR fixes an issue, use that number here. If there is no issue, | ||
then after you submit the PR and get the PR number you can add a | ||
changelog using that instead. | ||
|
||
If you are not sure what issue type to use, don't hesitate to ask in your PR. | ||
|
||
Note that the ``towncrier`` tool will automatically | ||
reflow your text, so it will work best if you stick to a single paragraph, but multiple sentences and links are OK | ||
and encouraged. You can install ``towncrier`` and then run ``towncrier --draft`` | ||
if you want to get a preview of how your change will look in the final release notes. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.