Code

Merge master into features#6691

Code

Closed

blueyed wants to merge 22 commits intopytest-dev:featurespytest-dev/pytest:featuresfrom blueyed:merge-master-into-featuresblueyed/pytest:merge-master-into-featuresCopy head branch name to clipboard

+127-89

Commits

Commits on Jan 31, 2020

• Fix favicon for Chrome and Opera (pytest-dev#6639)

  Show description for c9eeafa
  

  hugovk

  and

  nicoddemus

  authored
  c9eeafa

  Copy full SHA for c9eeafa

Commits on Feb 1, 2020

• PyCollector._genfunctions: use already created fixtureinfo (pytest-dev#6636)

  Show description for a9c5d31
  blueyed

  authored
  a9c5d31

  Copy full SHA for a9c5d31

Commits on Feb 2, 2020

• typing: wrap_session

  Show description for 8bd612b
  

  bluetech

  authored and

  blueyed

  committed
  8bd612b

  Copy full SHA for 8bd612b

• Handle Exit exception in pytest_sessionfinish

  Show description for 99d162e
  blueyed

  committed
  99d162e

  Copy full SHA for 99d162e

Commits on Feb 3, 2020

• doc: s/pytest_mark/pytestmark (pytest-dev#6661)

  rebecca-palmer

  authored
  c55bf23

  Copy full SHA for c55bf23

• Remove testing/test_modimport.py

  Show description for fb28966
  blueyed

  committed
  fb28966

  Copy full SHA for fb28966

• Keep (revisited) comment from pytest-dev@4d31ea831

  blueyed

  committed
  abffd16

  Copy full SHA for abffd16

• Explicitly state on the PR template that we can squash commits (pytest-dev#6662)

  Show description for 1480aa3
  nicoddemus

  authored
  1480aa3

  Copy full SHA for 1480aa3

• internal: clean up getfslineno

  Show description for b0d4526
  blueyed

  committed
  b0d4526

  Copy full SHA for b0d4526

• Code/getfslineno: keep empty co_filename

  Show description for 61f2a26
  blueyed

  committed
  61f2a26

  Copy full SHA for 61f2a26

• typing: fix getfslineno

  Show description for dab90ef
  blueyed

  committed
  dab90ef

  Copy full SHA for dab90ef

Commits on Feb 4, 2020

• Remove compat.getfslineno

  blueyed

  committed
  9c7f1d9

  Copy full SHA for 9c7f1d9

• assertion: save/restore hooks on item (pytest-dev#6646)

  blueyed

  authored
  aa03287

  Copy full SHA for aa03287

• testing/conftest.py: testdir: set PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 (pytest-dev#6655)

  Show description for 4316fe8
  blueyed

  authored
  4316fe8

  Copy full SHA for 4316fe8

• Remove testing/test_modimport.py (pytest-dev#6666)

  blueyed

  authored
  bc49466

  Copy full SHA for bc49466

• internal: clean up getfslineno (pytest-dev#6656)

  blueyed

  authored
  632800a

  Copy full SHA for 632800a

Commits on Feb 5, 2020

• pytester: clarify _makefile signature (pytest-dev#6675)

  blueyed

  authored
  cdc7e13

  Copy full SHA for cdc7e13

• Remove incorrect choices comment (pytest-dev#6677)

  rana-ahmed

  authored
  ef437ea

  Copy full SHA for ef437ea

Commits on Feb 6, 2020

• Handle Exit exception in pytest_sessionfinish (pytest-dev#6660)

  blueyed

  authored
  a8fc056

  Copy full SHA for a8fc056

Commits on Feb 8, 2020

• Merge master into features

  Show description for 23f14d5
  blueyed

  committed
  23f14d5

  Copy full SHA for 23f14d5

• ci: Travis: upgrade pip

  blueyed

  committed
  c0f0849

  Copy full SHA for c0f0849

• ci: Travis: tox -vv

  blueyed

  committed
  32a0920

  Copy full SHA for 32a0920