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.0
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.1
Choose a head ref
  • 7 commits
  • 9 files changed
  • 2 contributors

Commits on Sep 26, 2020

  1. Merge pull request #7797 from pytest-dev/release-6.1.0

    Prepare release 6.1.0
    bluetech authored Sep 26, 2020
    Configuration menu
    Copy the full SHA
    08a1ab3 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2020

  1. Configuration menu
    Copy the full SHA
    330caac View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2020

  1. Merge pull request #7813 from bluetech/findpaths-confusion

    findpaths: fix regression causing incorrect rootdir to be determined
    (cherry picked from commit b250c9d)
    bluetech committed Sep 30, 2020
    Configuration menu
    Copy the full SHA
    0f83df4 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #7822 from bluetech/backport-7813

    [6.1.x] findpaths: fix regression causing incorrect rootdir to be determined
    bluetech authored Sep 30, 2020
    Configuration menu
    Copy the full SHA
    bcb94c4 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2020

  1. terminal: fix crash in header reporting when absolute testpaths is used

    Regressed in 6.1.0 in 62e249a.
    The `x` is an `str` but is expected to be a `pathlib.Path`. Not caught
    by mypy because `config.getini()` returns `Any`.
    
    Fix by just removing the `bestrelpath` call:
    
    - testpaths are always relative to the rootdir, it thus would be very
      unusual to specify an absolute path there.
    
    - The code was wrong even before the regression: `py.path.local`'s
      `bestrelpath` function expects a `py.path.local`, not an `str`. But it
      had some weird `try ... except AttributeError` fallback which just
      returns the argument, i.e. it was a no-op. So there is no behavior
      change.
    
    - It seems reasonable to me to just print the full path if that's what
      the ini specifies.
    
    (cherry picked from commit 61f80a7)
    bluetech committed Oct 3, 2020
    Configuration menu
    Copy the full SHA
    1521849 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #7842 from bluetech/backport-7817

    [6.1.x] terminal: fix crash in header reporting when absolute testpaths is used
    bluetech authored Oct 3, 2020
    Configuration menu
    Copy the full SHA
    9df5267 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0ad20b5 View commit details
    Browse the repository at this point in the history
Loading