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

Merge master into features #4021

Merged
merged 50 commits into from
Sep 23, 2018
Merged

Merge master into features #4021

merged 50 commits into from
Sep 23, 2018

Commits on Sep 6, 2018

  1. Amend CHANGELOG with missing pytest-dev#3251

    @nicoddemus
    nicoddemus committed Sep 6, 2018
    Configuration menu
    Copy the full SHA
    b553512 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2018

  1. Merge pull request pytest-dev#3948 from nicoddemus/fix-changelog 

    Amend CHANGELOG with missing pytest-dev#3251
    @asottile
    asottile authored Sep 7, 2018
    Configuration menu
    Copy the full SHA
    3dd2933 View commit details
    Browse the repository at this point in the history

  2. Improve pre-commit detection for changelog filenames

    @asottile
    asottile committed Sep 7, 2018
    Configuration menu
    Copy the full SHA
    826adaf View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2018

  1. Merge pull request pytest-dev#3957 from asottile/changelog_files 

    Improve pre-commit detection for changelog filenames
    @asottile
    asottile authored Sep 8, 2018
    Configuration menu
    Copy the full SHA
    2c90b3d View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2018

  1. tests: use unittest.mock with py34+ 

    Fixes pytest-dev#3965.

Has to work around tox-dev/tox#706.

No coverage for pluggymaster builds is OK though anyway.
    @blueyed
    blueyed committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    7537e94 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2018

  1. Merge pull request pytest-dev#3967 from blueyed/optional-mock 

    tests: use unittest.mock with py34+
    @blueyed
    blueyed authored Sep 13, 2018
    Configuration menu
    Copy the full SHA
    2cf2dc3 View commit details
    Browse the repository at this point in the history

  2. remove the legacy code about im_func and generalize using fix and com… 

    …pat.getimfunc
    @RonnyPfannschmidt
    RonnyPfannschmidt committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    a0ce9a4 View commit details
    Browse the repository at this point in the history

  3. add changelog for fix pytest-dev#3975

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

  4. Merge pull request pytest-dev#3977 from RonnyPfannschmidt/remove-im-func 

    Remove im_func
    @nicoddemus
    nicoddemus authored Sep 13, 2018
    Configuration menu
    Copy the full SHA
    49800ea View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2018

  1. .pytest_cache is now automatically ignored by Git

    @nicoddemus
    nicoddemus committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    9aa6b09 View commit details
    Browse the repository at this point in the history

  2. Change flaky test_request_garbage to provide more debug information 

    This test fails *very* rarely when running in xdist.
    @nicoddemus
    nicoddemus committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    87ddb2d View commit details
    Browse the repository at this point in the history

  3. Update backward compatibility policy with new practices

    @nicoddemus
    nicoddemus committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    fa78da3 View commit details
    Browse the repository at this point in the history

  4. Ignore Sphinx's .doctrees folder

    @nicoddemus
    nicoddemus committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    cbb41f1 View commit details
    Browse the repository at this point in the history

  5. Fix rendering of the ini example for python_files 

    Also added an example using one pattern per line
    @nicoddemus
    nicoddemus committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    130cf7e View commit details
    Browse the repository at this point in the history

  6. Fix linting

    @nicoddemus
    nicoddemus committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    a4dd6ee View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2018

  1. Fix scope determination with indirect parameters 

    Fix pytest-dev#3941
    @nicoddemus
    nicoddemus committed Sep 15, 2018
    Configuration menu
    Copy the full SHA
    86a14d0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request pytest-dev#3982 from nicoddemus/ignore-pytest-cache 

    Ignore pytest cache
    @RonnyPfannschmidt
    RonnyPfannschmidt authored Sep 15, 2018
    Configuration menu
    Copy the full SHA
    f53eff9 View commit details
    Browse the repository at this point in the history

  3. Merge pull request pytest-dev#3984 from nicoddemus/fix-docs-formatting 

    Fix rendering of the ini example for python_files
    @nicoddemus
    nicoddemus authored Sep 15, 2018
    Configuration menu
    Copy the full SHA
    2803eb9 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2018

  1. Merge pull request pytest-dev#3983 from nicoddemus/update-backward-po… 

    …licy

Review backward compatibility policy
    @RonnyPfannschmidt
    RonnyPfannschmidt authored Sep 16, 2018
    Configuration menu
    Copy the full SHA
    bb57186 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2018

  1. tox: remove obsolete whitelist_externals

    @blueyed
    blueyed committed Sep 17, 2018
    Configuration menu
    Copy the full SHA
    93224f8 View commit details
    Browse the repository at this point in the history

  2. Travis: use codecov-bash 

    Faster to install and will retry uploads on connection errors.
    @blueyed
    blueyed committed Sep 17, 2018
    Configuration menu
    Copy the full SHA
    739f9a4 View commit details
    Browse the repository at this point in the history

  3. tox: coverage factor: combine and report

    @blueyed
    blueyed committed Sep 17, 2018
    Configuration menu
    Copy the full SHA
    03eaad3 View commit details
    Browse the repository at this point in the history

  4. Fix assertion rewriter crash if cwd changes mid-testing 

    Unfortunately we need to get a `py.path.local` object to perform the fnmatch
operation, it is different from the standard `fnmatch` module because it
implements its own custom logic. So we need to use `py.path` to perform
the fnmatch for backward compatibility reasons.

Ideally we should be able to use a "pure path" in `pathlib` terms (a path
not bound to the file system), but we don't have those in pylib.

Fix pytest-dev#3973
    @nicoddemus
    nicoddemus committed Sep 17, 2018
    Configuration menu
    Copy the full SHA
    1df6d28 View commit details
    Browse the repository at this point in the history

  5. Use a PurePath instance to do matching against patterns in assertion … 

    …rewrite

This way we don't need to have real file system path, which prevents the
original pytest-dev#3973 bug.
    @nicoddemus
    nicoddemus committed Sep 17, 2018
    Configuration menu
    Copy the full SHA
    37d2469 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2018

  1. [WIP] Introduce deprecations page 

    fix pytest-dev#3996
    @nicoddemus
    nicoddemus committed Sep 18, 2018
    Configuration menu
    Copy the full SHA
    ccb90b5 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2018

  1. coverage: use modules for source 

    This should increase coverage for subprocesses, where previously
`source` paths were used only from the config file, but not the initial
`--source` argument.
    @blueyed
    blueyed committed Sep 19, 2018
    Configuration menu
    Copy the full SHA
    28c9cc7 View commit details
    Browse the repository at this point in the history

  2. Add references to the relevant Python issues

    @nicoddemus
    nicoddemus authored Sep 19, 2018
    Configuration menu
    Copy the full SHA
    1e2e65f View commit details
    Browse the repository at this point in the history

  3. Fix linting

    @nicoddemus
    nicoddemus authored Sep 19, 2018
    Configuration menu
    Copy the full SHA
    7f48f55 View commit details
    Browse the repository at this point in the history

  4. logging: del item.catch_log_handler only in teardown 

    Without this caplog.record_tuples etc is not available anymore when using
`--pdb`.
    @blueyed
    blueyed committed Sep 19, 2018
    Configuration menu
    Copy the full SHA
    e7eb7e7 View commit details
    Browse the repository at this point in the history

  5. Merge pull request pytest-dev#3980 from nicoddemus/rewrite-cwd-changed 

    Fix assertion rewriter crash if cwd changes mid-testing
    @RonnyPfannschmidt
    RonnyPfannschmidt authored Sep 19, 2018
    Configuration menu
    Copy the full SHA
    29dac03 View commit details
    Browse the repository at this point in the history

  6. Improve CHANGELOG entry

    @nicoddemus
    nicoddemus authored Sep 19, 2018
    Configuration menu
    Copy the full SHA
    d1fa8ae View commit details
    Browse the repository at this point in the history

  7. Update customize.rst

    @wimglenn
    wimglenn authored Sep 19, 2018
    Configuration menu
    Copy the full SHA
    e86b01e View commit details
    Browse the repository at this point in the history

  8. Merge pull request pytest-dev#4003 from pytest-dev/wimglenn-patch-1 

    seems this subdir is now .pytest_cache not .cache
    @wimglenn
    wimglenn authored Sep 19, 2018
    Configuration menu
    Copy the full SHA
    1f28096 View commit details
    Browse the repository at this point in the history

  9. Introduce deprecations page 

    fix pytest-dev#3996
    @nicoddemus
    nicoddemus committed Sep 19, 2018
    Configuration menu
    Copy the full SHA
    c284154 View commit details
    Browse the repository at this point in the history

  10. Merge pull request pytest-dev#3990 from blueyed/coverage-source 

    coverage: use modules
    @nicoddemus
    nicoddemus authored Sep 19, 2018
    Configuration menu
    Copy the full SHA
    10b3b2d View commit details
    Browse the repository at this point in the history

  11. Merge pull request pytest-dev#3987 from nicoddemus/fix-find-scope-3941 

    Fix scope determination with indirect parameters
    @nicoddemus
    nicoddemus authored Sep 19, 2018
    Configuration menu
    Copy the full SHA
    27772f6 View commit details
    Browse the repository at this point in the history

  12. Merge pull request pytest-dev#3998 from blueyed/logging-del 

    logging: del item.catch_log_handler only in teardown
    @nicoddemus
    nicoddemus authored Sep 19, 2018
    Configuration menu
    Copy the full SHA
    7aff817 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2018

  1. Fix UnicodeDecodeError in assertion with mixed non-ascii bytes repr +… 

    … text
    @asottile
    asottile committed Sep 20, 2018
    Configuration menu
    Copy the full SHA
    7122fa5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request pytest-dev#3997 from nicoddemus/deprecation-docs 

    Introduce deprecations page
    @nicoddemus
    nicoddemus authored Sep 20, 2018
    Configuration menu
    Copy the full SHA
    7a5e11b View commit details
    Browse the repository at this point in the history

  3. Merge pull request pytest-dev#4001 from asottile/fix_bytes_repr_text_… 

    …mix_python_2

Fix UnicodeDecodeError in assertion with mixed non-ascii bytes repr + text
    @RonnyPfannschmidt
    RonnyPfannschmidt authored Sep 20, 2018
    Configuration menu
    Copy the full SHA
    f6eb39d View commit details
    Browse the repository at this point in the history

  4. Fix 'Package has no len()' error during collection 

    Fix pytest-dev#3749
    @nicoddemus
    nicoddemus committed Sep 20, 2018
    Configuration menu
    Copy the full SHA
    41f6ea1 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2018

  1. Merge pull request pytest-dev#4010 from nicoddemus/package-len-error-… 

    …3749

Fix 'Package has no len()' error during collection
    @RonnyPfannschmidt
    RonnyPfannschmidt authored Sep 21, 2018
    Configuration menu
    Copy the full SHA
    f02dbaf View commit details
    Browse the repository at this point in the history

  2. Fix typo in docstring

    Maximilian Albert committed Sep 21, 2018
    Configuration menu
    Copy the full SHA
    9b382ed View commit details
    Browse the repository at this point in the history

  3. Merge pull request pytest-dev#4012 from maxalbert/fix-docstring-typo 

    Fix typo in docstring
    @crazymerlyn
    crazymerlyn authored Sep 21, 2018
    Configuration menu
    Copy the full SHA
    58aa4f9 View commit details
    Browse the repository at this point in the history

  4. Include Python 3.7 on getting started doc 

    Close pytest-dev#3932
    @williamjamir
    williamjamir authored Sep 21, 2018
    Configuration menu
    Copy the full SHA
    650c458 View commit details
    Browse the repository at this point in the history

  5. Merge pull request pytest-dev#4016 from williamjamir/patch-1 

    Include Python 3.7 on getting started doc
    @nicoddemus
    nicoddemus authored Sep 21, 2018
    Configuration menu
    Copy the full SHA
    4ba3cb2 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2018

  1. Preparing release version 3.8.1

    @crazymerlyn
    crazymerlyn committed Sep 22, 2018
    Configuration menu
    Copy the full SHA
    3f6a46c View commit details
    Browse the repository at this point in the history

  2. Merge pull request pytest-dev#4020 from crazymerlyn/release-3.8.1 

    Preparing release version 3.8.1
    @crazymerlyn
    crazymerlyn authored Sep 22, 2018
    Configuration menu
    Copy the full SHA
    ec57cbf View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into merge-master-into… 

    …-features
    @nicoddemus
    nicoddemus committed Sep 22, 2018
    Configuration menu
    Copy the full SHA
    56d0b5a View commit details
    Browse the repository at this point in the history

  4. Add "deprecation" to possible changelog entries in pre-commit

    @nicoddemus
    nicoddemus committed Sep 22, 2018
    Configuration menu
    Copy the full SHA
    fcc5b6d View commit details
    Browse the repository at this point in the history