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.2.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.2.2
Choose a head ref
  • 13 commits
  • 32 files changed
  • 6 contributors

Commits on Dec 15, 2020

  1. Merge pull request #8149 from pytest-dev/release-6.2.1 

    Prepare release 6.2.1
    @nicoddemus
    nicoddemus authored Dec 15, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a566eb9 View commit details

Commits on Dec 16, 2020

  1. Clarify fixture execution order and provide visual aids (#7381) 

    Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
Co-authored-by: Ran Benita <ran@unusedvar.com>
    @SalmonMode @nicoddemus @bluetech
    3 people committed Dec 16, 2020
    Copy the full SHA
    da82e18 View commit details

  2. Merge pull request #8160 from nicoddemus/backport-7381 

    [6.2.x] Clarify fixture execution order and provide visual aids (#7381)
    @nicoddemus
    nicoddemus authored Dec 16, 2020
    Copy the full SHA
    1f0c50b View commit details

Commits on Dec 17, 2020

  1. Merge pull request #8152 from bluetech/empty-skip 

    terminal: fix "(<Skipped instance>)" skip reason in test status line
(cherry picked from commit 02e69e5)
    @bluetech
    bluetech committed Dec 17, 2020
    Copy the full SHA
    b8201c2 View commit details

  2. Merge pull request #8163 from bluetech/backport-8152 

    [6.2.x] terminal: fix "(<Skipped instance>)" skip reason in test status line
    @nicoddemus
    nicoddemus authored Dec 17, 2020
    Copy the full SHA
    f7d1ab8 View commit details

  3. Add Changelog to setup.cfg (#8166) 

    Co-authored-by: Thomas Grainger <tagrain@gmail.com>
Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
    @adamchainz @graingert @nicoddemus
    3 people committed Dec 17, 2020
    Copy the full SHA
    baaee21 View commit details

  4. Merge pull request #8167 from nicoddemus/backport-8166 

    [6.2.x] Add Changelog to setup.cfg (#8166)
    @nicoddemus
    nicoddemus authored Dec 17, 2020
    Copy the full SHA
    8dbf9dc View commit details

Commits on Jan 5, 2021

  1. Merge pull request #8220 from xuhdev/module-doc 

    DOC: Mark pytest module
    @nicoddemus
    nicoddemus committed Jan 5, 2021
    Copy the full SHA
    99fe887 View commit details

  2. Merge pull request #8224 from nicoddemus/backport-8220 

    [6.2.x] DOC: Mark pytest module
    @nicoddemus
    nicoddemus authored Jan 5, 2021
    Copy the full SHA
    45facc1 View commit details

  3. Merge pull request #8225 from The-Compiler/training-update (#8226) 

    doc: Add note about training early bird discount
    @nicoddemus
    nicoddemus authored Jan 5, 2021
    Copy the full SHA
    14e0c3e View commit details

Commits on Jan 20, 2021

  1. Merge pull request #8250 from daq-tools/fix-twisted-capture

    @nicoddemus
    nicoddemus committed Jan 20, 2021
    Copy the full SHA
    8d605b9 View commit details

  2. Merge pull request #8259 from nicoddemus/backport-8250 

    [6.2.x] Fix faulthandler for Twisted Logger when used with "--capture=no"
    @nicoddemus
    nicoddemus authored Jan 20, 2021
    Copy the full SHA
    8003fd2 View commit details

Commits on Jan 25, 2021

  1. Prepare release version 6.2.2

    @pytestbot
    pytestbot committed Jan 25, 2021
    Copy the full SHA
    b9c9876 View commit details
Loading