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-mock
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.3.1
Choose a base ref
...
head repository: pytest-dev/pytest-mock
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.5.0
Choose a head ref
  • 17 commits
  • 8 files changed
  • 7 contributors

Commits on Aug 24, 2020

  1. remove redundant unittest.mock imports

    @graingert
    graingert committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    a7d1c8f View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2020

  1. Merge pull request #201 from srittau/type-improvements

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

Commits on Aug 29, 2020

  1. Merge pull request #203 from graingert/remove-redundant-code 

    remove redundant unittest.mock imports
    @nicoddemus
    nicoddemus authored Aug 29, 2020
    Configuration menu
    Copy the full SHA
    632af5e View commit details
    Browse the repository at this point in the history

  2. remove type annotations from docstrings

    @graingert
    graingert authored Aug 29, 2020
    Configuration menu
    Copy the full SHA
    e6cc1ec View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2020

  1. Set a new fixture type

    @Abstract-X
    Abstract-X committed Sep 10, 2020
    Configuration menu
    Copy the full SHA
    dc013a0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #209 from Abstract-X/change-fixture-type 

    Set a new fixture type
    @nicoddemus
    nicoddemus authored Sep 10, 2020
    Configuration menu
    Copy the full SHA
    bd8f613 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2020

  1. 🦭 Add seal shortcut to mocker fixture (#211) 

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

Commits on Dec 11, 2020

  1. Ensure all the exceptions cat be spied on 

    This change replaces `Exception` with `BaseException` in the `spy()`
method provided by the `mocker` fixture. This enables the caller to
spy on things like `KeyboardInterrupt`, `GeneratorExit` and
`SystemExit` exceptions that hasn't been possible before because of
a bug.

Before this change, any occurances of the above exceptions caused
`spy()` to assign `None` to both `spy_return` and `spy_exception`
attributes.

Fixes #215
    @webknjaz
    webknjaz committed Dec 11, 2020
    Configuration menu
    Copy the full SHA
    0e6b221 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2020

  1. Merge pull request #216 from webknjaz/bugfixes/215-spy-on-keyboard-in… 

    …terrupt

Ensure all the exceptions can be spied on
    @nicoddemus
    nicoddemus authored Dec 15, 2020
    Configuration menu
    Copy the full SHA
    9640a36 View commit details
    Browse the repository at this point in the history

  2. Add testing for Python 3.9 (#218)

    @kujyp
    kujyp authored Dec 15, 2020
    Configuration menu
    Copy the full SHA
    91b4afb View commit details
    Browse the repository at this point in the history

  3. Prepare release 3.4.0

    @nicoddemus
    nicoddemus committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    df9ec17 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #219 from nicoddemus/release-3.4.0 

    Prepare release 3.4.0
    @nicoddemus
    nicoddemus authored Dec 15, 2020
    Configuration menu
    Copy the full SHA
    252eba8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #208 from pytest-dev/graingert-patch-1 

    remove type annotations from docstrings
    @nicoddemus
    nicoddemus authored Dec 15, 2020
    Configuration menu
    Copy the full SHA
    d4e3f3e View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2020

  1. Fix typos in a change note for the PR #216

    @webknjaz
    webknjaz committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    9771def View commit details
    Browse the repository at this point in the history

  2. Merge pull request #220 from webknjaz/docs/216-changelog 

    Fix typos in a change note for the PR #216
    @nicoddemus
    nicoddemus authored Dec 16, 2020
    Configuration menu
    Copy the full SHA
    5f6cab7 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2021

  1. Warn instead of raising exception in context manager (#221) 

    Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
    @iforapsy @nicoddemus
    iforapsy and nicoddemus authored Jan 4, 2021
    Configuration menu
    Copy the full SHA
    f623fa8 View commit details
    Browse the repository at this point in the history

  2. Update context-manager docs and prepare for 3.5.0

    @nicoddemus
    nicoddemus committed Jan 4, 2021
    Configuration menu
    Copy the full SHA
    cdd5d70 View commit details
    Browse the repository at this point in the history
Loading