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

fix addmarker - extract mark from markdecorator #3576

Merged
merged 17 commits into from
Jun 13, 2018
Merged

fix addmarker - extract mark from markdecorator #3576

merged 17 commits into from
Jun 13, 2018

Commits on Jun 11, 2018

  1. Improve contributing instructions regarding black/linting

    @nicoddemus
    nicoddemus committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    f300f7f View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2018

  1. Remove unused scripts from docs

    @nicoddemus
    nicoddemus committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    4983de6 View commit details
    Browse the repository at this point in the history

  2. Remove obsolete doc/en/test directory 

    Apparently this was an old version of the docs, which has long been superseded
    @nicoddemus
    nicoddemus committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    d6e7b1a View commit details
    Browse the repository at this point in the history

  3. Merge pull request pytest-dev#3571 from nicoddemus/pre-commit-contrib… 

    …utors-guide

Improve contributing instructions regarding black/linting
    @RonnyPfannschmidt
    RonnyPfannschmidt committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    1b5322d View commit details
    Browse the repository at this point in the history

  4. fix addmarker - extract mark from markdecorator

    @RonnyPfannschmidt
    RonnyPfannschmidt committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    37793d4 View commit details
    Browse the repository at this point in the history

  5. Improve CHANGELOG formatting

    @nicoddemus
    nicoddemus committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    9a7c3a6 View commit details
    Browse the repository at this point in the history

  6. rework Node.add_marker parameter list and docstring

    @RonnyPfannschmidt
    RonnyPfannschmidt committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    b0ec442 View commit details
    Browse the repository at this point in the history

  7. Fix three spaces instead of four in docs

    @BartoszCki
    BartoszCki committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    f786534 View commit details
    Browse the repository at this point in the history

  8. Merge pull request pytest-dev#3578 from BartoszCki/master 

    Fix three spaces instead of four in docs
    @nicoddemus
    nicoddemus committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    077c44c View commit details
    Browse the repository at this point in the history

  9. Merge pull request pytest-dev#3572 from nicoddemus/remove-unused-scripts 

    Remove unused scripts and old docs
    @RonnyPfannschmidt
    RonnyPfannschmidt committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    52c4279 View commit details
    Browse the repository at this point in the history

  10. mark test_wrapped_getfuncargnames_patching as xfail

    @RonnyPfannschmidt
    RonnyPfannschmidt committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    321f66f View commit details
    Browse the repository at this point in the history

  11. Add mock dependency to py27-nobyte

    @nicoddemus
    nicoddemus committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    88ae21f View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2018

  1. Merge pull request pytest-dev#3577 from RonnyPfannschmidt/addmarker-fix 

    fix addmarker - extract mark from markdecorator
    @nicoddemus
    nicoddemus committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    4d0297b View commit details
    Browse the repository at this point in the history

  2. fix addmarker - extract mark from markdecorator

    @RonnyPfannschmidt
    RonnyPfannschmidt committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    eb0c6a8 View commit details
    Browse the repository at this point in the history

  3. changelog

    @RonnyPfannschmidt
    RonnyPfannschmidt committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    791bb35 View commit details
    Browse the repository at this point in the history

  4. Fix add_marker docs

    @nicoddemus
    nicoddemus committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    b5102d0 View commit details
    Browse the repository at this point in the history

  5. fix whitespace

    @RonnyPfannschmidt
    RonnyPfannschmidt committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    8d07220 View commit details
    Browse the repository at this point in the history