Merge master into features #5319

blueyed · 2019-05-27T23:46:49Z

No description provided.

Since Python 3 it must be "utf-8", which is the official name. This is backwards compatible with Python 2.

Fixes pytest-dev#5277.

…ellings Fix one misspelling in changelog

Fix documentation of pytest.raises(match=...)

…port` option when using a list of test IDs

add a missing import

As commented in: pytest-dev#5240 (comment)

Update fixture.rst

Add link to tidelift to the main docs

…scaping-option Fix `disable_test_id_escaping_and_forfeit_all_rights_to_community_support` option when using a list of test IDs

This is required for pytest-pdb to be called with `--pdb`. TODO: - [ ] test - [ ] pass mode to hook, e.g. "post_mortem" in this case?

This happened in test_pdb_with_caplog_on_pdb_invocation.

Allow disabling of python plugin

Following instructions from: * https://tidelift.com/subscription/how-to-connect-tidelift-with-github * https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-repository#displaying-a-sponsor-button-in-your-repository

changelog: Fix typo

Fix invalid Python file encoding "utf8"

pdb: trigger pytest_enter_pdb hook with post-mortem

This reverts commit 31dfbb4.

Fixes pytest-dev#2064.

As discussed in pytest-dev#5275

Update docs about py27 and py34 support plans

pdb: import pdbcls lazily

nicoddemus · 2019-05-27T23:52:15Z

Changed the base to features 😉

asottile

codecov · 2019-05-28T00:14:21Z

Codecov Report

Merging #5319 into features will increase coverage by 0.35%.
The diff coverage is 93.26%.

@@             Coverage Diff              @@
##           features    #5319      +/-   ##
============================================
+ Coverage     92.81%   93.16%   +0.35%     
============================================
  Files           115      115              
  Lines         26171    26266      +95     
  Branches       2585     2595      +10     
============================================
+ Hits          24291    24472     +181     
+ Misses         1562     1474      -88     
- Partials        318      320       +2

Impacted Files	Coverage Δ
testing/test_warnings.py	`98.9% <ø> (ø)`	⬆️
src/_pytest/assertion/truncate.py	`92.59% <ø> (+0.13%)`	⬆️
testing/test_modimport.py	`100% <ø> (ø)`	⬆️
testing/test_terminal.py	`98.13% <ø> (+11.35%)`	⬆️
src/_pytest/_io/saferepr.py	`80.43% <ø> (ø)`	⬆️
testing/test_conftest.py	`99.62% <ø> (ø)`	⬆️
src/_pytest/pastebin.py	`90.76% <ø> (+0.14%)`	⬆️
testing/test_parseopt.py	`97.97% <ø> (ø)`	⬆️
src/_pytest/cacheprovider.py	`97.84% <ø> (ø)`	⬆️
src/_pytest/_code/code.py	`95.49% <ø> (ø)`	⬆️
... and 107 more

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 2b9ca34...e032904. Read the comment docs.

tambry and others added 30 commits May 12, 2019 19:14

Fix invalid Python file encoding "utf8"

1802446

Since Python 3 it must be "utf-8", which is the official name. This is backwards compatible with Python 2.

Normalize all source encoding declarations

7573747

Use fix-encoding-pragma pre-commit hook

dc75b6a

Upgrade pre-commit/pre-commit-hooks

b81173e

Allow disabling of python plugin

93fd9de

Fixes pytest-dev#5277.

Fix misspellings

8f04bd0

Merge pull request pytest-dev#5287 from clickthisnick/chore-fix-missp…

ee52a8a

…ellings Fix one misspelling in changelog

Fix documentation of pytest.raises(match=...)

b27e40c

Fix documentation of pytest.raises(match=...) (pytest-dev#5288)

6663cb0

Fix documentation of pytest.raises(match=...)

Fix `disable_test_id_escaping_and_forfeit_all_rights_to_community_sup…

a304dbb

…port` option when using a list of test IDs

Update fixture.rst

c5fa1d1

add a missing import

Add link to tidelift to the main docs

d391274

As commented in: pytest-dev#5240 (comment)

Update fixture.rst (pytest-dev#5295)

65342db

Update fixture.rst

Merge pull request pytest-dev#5297 from nicoddemus/tidelift-contents

45c894b

Add link to tidelift to the main docs

Add tests for pytest-dev#5286

8a49870

Merge pull request pytest-dev#5294 from akiomik/fix-disable_test_id_e…

de7ba59

…scaping-option Fix `disable_test_id_escaping_and_forfeit_all_rights_to_community_support` option when using a list of test IDs

changelog [ci skip]

97b85a1

pdb: trigger pytest_enter_pdb hook with post-mortem

a0ff5de

This is required for pytest-pdb to be called with `--pdb`. TODO: - [ ] test - [ ] pass mode to hook, e.g. "post_mortem" in this case?

CaptureFixture: do not crash in _suspend when not started

e0b584d

This happened in test_pdb_with_caplog_on_pdb_invocation.

Merge pull request pytest-dev#5278 from blueyed/disable-python-plugin

6c56070

Allow disabling of python plugin

Create FUNDING.yml

0cacdad

Following instructions from: * https://tidelift.com/subscription/how-to-connect-tidelift-with-github * https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-repository#displaying-a-sponsor-button-in-your-repository

Fix whitespace in FUNDING.yml

aaea4e5

changelog: Fix typo

84c7fef

changelog: Fix typo (pytest-dev#5304)

364ae5d

changelog: Fix typo

Fix invalid Python file encoding "utf8" (pytest-dev#5252)

66f20b6

Fix invalid Python file encoding "utf8"

Merge pull request pytest-dev#4908 from blueyed/pdb-pm-enter-hook

fa8a658

pdb: trigger pytest_enter_pdb hook with post-mortem

logging: Simple impl of multline pretty printing

31dfbb4

Revert "logging: Simple impl of multline pretty printing"

bed3918

This reverts commit 31dfbb4.

Small change to test if pushing directly to master is disabled

e393a73

pdb: import pdbcls lazily

f2ed796

Fixes pytest-dev#2064.

nicoddemus and others added 4 commits May 27, 2019 19:28

Update docs about py27 and py34 support plans

e385610

As discussed in pytest-dev#5275

Update docs about py27 and py34 support plans (pytest-dev#5316)

bc49d6f

Update docs about py27 and py34 support plans

pdb: import pdbcls lazily (pytest-dev#5307)

ece774f

pdb: import pdbcls lazily

Merge master into features

e032904

blueyed mentioned this pull request May 27, 2019

pdb: import pdbcls lazily #5307

Merged

nicoddemus changed the base branch from master to features May 27, 2019 23:51

asottile approved these changes May 27, 2019

View reviewed changes

nicoddemus approved these changes May 28, 2019

View reviewed changes

blueyed merged commit 6061ecf into pytest-dev:features May 28, 2019

blueyed deleted the mm branch May 28, 2019 00:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Merge master into features #5319

Merge master into features #5319

Uh oh!

blueyed commented May 27, 2019

Uh oh!

nicoddemus commented May 27, 2019

Uh oh!

asottile left a comment

Uh oh!

codecov bot commented May 28, 2019 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Merge master into features #5319

Merge master into features #5319

Uh oh!

Conversation

blueyed commented May 27, 2019

Uh oh!

nicoddemus commented May 27, 2019

Uh oh!

asottile left a comment

Choose a reason for hiding this comment

Uh oh!

codecov bot commented May 28, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

codecov bot commented May 28, 2019 •

edited

Loading