Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 2836 fixture collection bug #2862

Merged
merged 13 commits into from
Oct 24, 2017
Merged

Issue 2836 fixture collection bug #2862

merged 13 commits into from
Oct 24, 2017

Commits on Oct 23, 2017

  1. Add failing test

    @tom-dalton-fanduel
    tom-dalton-fanduel committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    29fa9d5 View commit details
    Browse the repository at this point in the history

  2. Test now looks for real expected output

    @tom-dalton-fanduel
    tom-dalton-fanduel committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    c03612f View commit details
    Browse the repository at this point in the history

  3. Working (I think) fix for #2836

    @tom-dalton-fanduel
    tom-dalton-fanduel committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    1e6dc6f View commit details
    Browse the repository at this point in the history

  4. Add changelog entry for #2836

    @tom-dalton-fanduel
    tom-dalton-fanduel committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    f003914 View commit details
    Browse the repository at this point in the history

  5. Added Tom Dalton to AUTHORS

    @tom-dalton-fanduel
    tom-dalton-fanduel committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    de9d116 View commit details
    Browse the repository at this point in the history

  6. Remove redundant if, tidy if-body

    @tom-dalton-fanduel
    tom-dalton-fanduel committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    ee7e1c9 View commit details
    Browse the repository at this point in the history

  7. Shorter code, longer docstring

    @tom-dalton-fanduel
    tom-dalton-fanduel committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    d714c19 View commit details
    Browse the repository at this point in the history

  8. Docstring typo

    @tom-dalton-fanduel
    tom-dalton-fanduel committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    a7199fa View commit details
    Browse the repository at this point in the history

  9. Address more review comments, fix massive bug I reintroduced in the n… 

    …ode-splitting code :-/
    @tom-dalton-fanduel
    tom-dalton-fanduel committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    655ab0b View commit details
    Browse the repository at this point in the history

  10. Add E722 and E741 flake errors to the ignore list 

    Also fixed 'E704 multiple statements on one line (def)' in python_api
    @nicoddemus
    nicoddemus committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    a3ec3df View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2017

  1. Move the generic separator to a constant

    @tom-dalton-fanduel
    tom-dalton-fanduel committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    14e3a5f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'issue-2836-fixture-collection-bug' of github.com:tom-da… 

    …lton-fanduel/pytest into issue-2836-fixture-collection-bug
    @tom-dalton-fanduel
    tom-dalton-fanduel committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    a5ac19c View commit details
    Browse the repository at this point in the history

  3. Unused import / lint

    @tom-dalton-fanduel
    tom-dalton-fanduel committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    f5e72d2 View commit details
    Browse the repository at this point in the history