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.1.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.1.2
Choose a head ref
  • 12 commits
  • 14 files changed
  • 6 contributors

Commits on Oct 3, 2020

  1. Merge pull request #7849 from pytest-dev/release-6.1.1 

    Prepare release 6.1.1
    @bluetech
    bluetech authored Oct 3, 2020
    Configuration menu
    Copy the full SHA
    69d9032 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2020

  1. Update reference.rst informing the default junit_family (#7860) 

    Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
    @williamjamir @nicoddemus
    williamjamir and nicoddemus committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    7ccfc39 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7861 from nicoddemus/backport-7860 

    [6.1.x] Update reference.rst informing the default junit_family (#7860)
    @nicoddemus
    nicoddemus authored Oct 5, 2020
    Configuration menu
    Copy the full SHA
    dc96e48 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2020

  1. Add alias clarification to deprecation warning (#7829) 

    Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
    @mmarinez @nicoddemus
    mmarinez and nicoddemus committed Oct 6, 2020
    Configuration menu
    Copy the full SHA
    c93962c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7867 from nicoddemus/backport-7829

    @nicoddemus
    nicoddemus authored Oct 6, 2020
    Configuration menu
    Copy the full SHA
    95fd566 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2020

  1. Merge pull request #7915 from bluetech/fix-lf-package 

    cacheprovider: fix some files in packages getting lost from --lf
(cherry picked from commit a66b6b8)

with some needed adjustments to 6.1.x.
    @bluetech
    bluetech committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    9237b5f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7918 from bluetech/backport-7915 

    [6.1.x] cacheprovider: fix some files in packages getting lost from --lf
    @bluetech
    bluetech authored Oct 21, 2020
    Configuration menu
    Copy the full SHA
    46195ed View commit details
    Browse the repository at this point in the history

  3. Merge pull request #7917 from bluetech/ci-timeout 

    ci: decrease job timeout from 6 hours to 30 minutes
    @nicoddemus
    nicoddemus committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    cd57271 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #7919 from nicoddemus/backport-7917 

    [6.1.x] ci: decrease job timeout from 6 hours to 30 minutes
    @nicoddemus
    nicoddemus authored Oct 21, 2020
    Configuration menu
    Copy the full SHA
    a88fe58 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2020

  1. Increase temp dir deletion period to 3 days (#7914) 

    Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
    @vgerak @nicoddemus
    vgerak and nicoddemus committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    8c1c1ae View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7955 from nicoddemus/backport-7914 

    [6.1.x] Increase temp dir deletion period to 3 days (#7914)
    @nicoddemus
    nicoddemus authored Oct 28, 2020
    Configuration menu
    Copy the full SHA
    cd221df View commit details
    Browse the repository at this point in the history

  3. Prepare release version 6.1.2

    @pytestbot
    pytestbot committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    4e8b50b View commit details
    Browse the repository at this point in the history
Loading