Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pytest-dev/pytest
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6.0.1
Choose a base ref
...
head repository: pytest-dev/pytest
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6.0.2
Choose a head ref
  • 16 commits
  • 17 files changed
  • 3 contributors

Commits on Jul 30, 2020

  1. Merge pull request #7584 from pytest-dev/release-6.0.1 

    Prepare release 6.0.1
    @nicoddemus
    nicoddemus authored Jul 30, 2020
    Configuration menu
    Copy the full SHA
    022bff2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7557 from nicoddemus/announce-templates 

    (cherry picked from commit c7216ae)
    @nicoddemus
    nicoddemus committed Jul 30, 2020
    Configuration menu
    Copy the full SHA
    5a339f0 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #7588 from nicoddemus/backport-7557 

    Merge pull request #7557 from nicoddemus/announce-templates
    @nicoddemus
    nicoddemus authored Jul 30, 2020
    Configuration menu
    Copy the full SHA
    6110f84 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2020

  1. Merge pull request #7673 from bluetech/logging-fix-handler-restore 

    logging: fix handler level restored incorrectly if caplog.set_level is called more than once
(cherry picked from commit 143e3ab)
    @bluetech
    bluetech committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    834f55e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7676 from bluetech/backport-7673 

    [6.0.x] logging: fix handler level restored incorrectly if caplog.set_level is called more than once
    @bluetech
    bluetech authored Aug 23, 2020
    Configuration menu
    Copy the full SHA
    79d0d3e View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2020

  1. Merge pull request #7687 from bluetech/idval-notset 

    python: fix empty parametrize() leading to "NotSetType.token" id
    @nicoddemus
    nicoddemus committed Aug 25, 2020
    Configuration menu
    Copy the full SHA
    9a91b67 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2020

  1. Merge pull request #7688 from nicoddemus/backport-7687

    @nicoddemus
    nicoddemus authored Aug 26, 2020
    Configuration menu
    Copy the full SHA
    0115b71 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2020

  1. Merge pull request #7708 from nicoddemus/repr-line-7707 

    Fix handle of exceptions in ReprEntry with tb=line
    @nicoddemus
    nicoddemus committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    912870d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7711 from nicoddemus/backport-7708 

    [6.0] Merge pull request #7708 from nicoddemus/repr-line-7707
    @nicoddemus
    nicoddemus authored Sep 4, 2020
    Configuration menu
    Copy the full SHA
    e9d18bd View commit details
    Browse the repository at this point in the history

  3. Merge pull request #7651 from bluetech/capture-safe-disable 

    capture: fix disabled()/global_and_fixture_disabled() enabling capturing when it was disabled

(cherry picked from commit bb38ae9)
    @bluetech
    bluetech committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    9a879ee View commit details
    Browse the repository at this point in the history

  4. Merge pull request #7697 from nicoddemus/file-docs 

    (cherry picked from commit 21aa6c4)
    @nicoddemus @bluetech
    nicoddemus authored and bluetech committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    cb91c50 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #7614 from The-Compiler/log-print 

    Properly remove log_print

(cherry picked from commit d688fef)
    @nicoddemus @bluetech
    nicoddemus authored and bluetech committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    e63fac3 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #7715 from bluetech/backport-7651 

    [6.0.x] capture: fix disabled()/global_and_fixture_disabled() enabling capturing when it was disabled
    @bluetech
    bluetech authored Sep 4, 2020
    Configuration menu
    Copy the full SHA
    309810a View commit details
    Browse the repository at this point in the history

  7. Merge pull request #7716 from bluetech/backport-7697 

    [6.0.x] Add missing File reference to the docs
    @bluetech
    bluetech authored Sep 4, 2020
    Configuration menu
    Copy the full SHA
    f4f30d7 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #7717 from bluetech/backport-7614 

    [6.0.x] Properly remove log_print
    @bluetech
    bluetech authored Sep 4, 2020
    Configuration menu
    Copy the full SHA
    ea65ea8 View commit details
    Browse the repository at this point in the history

  9. Prepare release version 6.0.2

    @pytestbot
    pytestbot committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    09b1d7c View commit details
    Browse the repository at this point in the history
Loading