appveyor.yml → .appveyor.yml

@@ -1,14 +1,14 @@
-# NOTE: this file is auto-generated via ci/bootstrap.py (ci/templates/appveyor.yml).
+# NOTE: this file is auto-generated via ci/bootstrap.py (ci/templates/.appveyor.yml).
 version: '{branch}-{build}'
 build: off
 environment:
   matrix:
     - TOXENV: check
-    - TOXENV: 'py27-pytest46-xdist27-coverage45,py27-pytest46-xdist27-coverage51'
-    - TOXENV: 'py35-pytest46-xdist27-coverage45,py35-pytest46-xdist27-coverage51'
-    - TOXENV: 'py36-pytest46-xdist27-coverage45,py36-pytest46-xdist27-coverage51,py36-pytest46-xdist32-coverage45,py36-pytest46-xdist32-coverage51,py36-pytest54-xdist32-coverage45,py36-pytest54-xdist32-coverage51'
-    - TOXENV: 'py37-pytest46-xdist27-coverage45,py37-pytest46-xdist27-coverage51,py37-pytest46-xdist32-coverage45,py37-pytest46-xdist32-coverage51,py37-pytest54-xdist32-coverage45,py37-pytest54-xdist32-coverage51'
-    - TOXENV: 'pypy-pytest46-xdist27-coverage45,pypy-pytest46-xdist27-coverage51'
+    - TOXENV: 'py27-pytest46-xdist27-coverage45,py27-pytest46-xdist27-coverage52'
+    - TOXENV: 'py35-pytest46-xdist27-coverage45,py35-pytest46-xdist27-coverage52'
+    - TOXENV: 'py36-pytest46-xdist27-coverage45,py36-pytest46-xdist27-coverage52,py36-pytest46-xdist33-coverage45,py36-pytest46-xdist33-coverage52,py36-pytest54-xdist33-coverage45,py36-pytest54-xdist33-coverage52,py36-pytest60-xdist200-coverage52'
+    - TOXENV: 'py37-pytest46-xdist27-coverage45,py37-pytest46-xdist27-coverage52,py37-pytest46-xdist33-coverage45,py37-pytest46-xdist33-coverage52,py37-pytest54-xdist33-coverage45,py37-pytest54-xdist33-coverage52,py37-pytest60-xdist200-coverage52'
+    - TOXENV: 'pypy-pytest46-xdist27-coverage45,pypy-pytest46-xdist27-coverage52'
 
 init:
   - ps: echo $env:TOXENV
@@ -17,11 +17,10 @@ install:
   - IF "%TOXENV:~0,5%" == "pypy-" choco install --no-progress python.pypy
   - IF "%TOXENV:~0,6%" == "pypy3-" choco install --no-progress pypy3
   - SET PATH=C:\tools\pypy\pypy;%PATH%
-  - C:\Python37\python -m pip install -U "virtualenv>=16.5.0"
-  - C:\Python37\python -m pip install tox
+  - C:\Python37\python -m pip install --progress-bar=off tox -rci/requirements.txt
 
 test_script:
-  - C:\Python37\python -m tox
+  - cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd C:\Python37\python -m tox
 
 on_failure:
   - ps: dir "env:"

.bumpversion.cfg

@@ -1,13 +1,21 @@
 [bumpversion]
-current_version = 2.10.0
+current_version = 2.10.1
 commit = True
 tag = True
 
 [bumpversion:file:setup.py]
+search = version='{current_version}'
+replace = version='{new_version}'
 
 [bumpversion:file:README.rst]
+search = v{current_version}.
+replace = v{new_version}.
 
 [bumpversion:file:docs/conf.py]
+search = version = release = '{current_version}'
+replace = version = release = '{new_version}'
 
 [bumpversion:file:src/pytest_cov/__init__.py]
+search = __version__ = '{current_version}'
+replace = __version__ = '{new_version}'
 

.cookiecutterrc

@@ -1,36 +1,56 @@
 # Generated by cookiepatcher, a small shim around cookiecutter (pip install cookiepatcher)
 
 cookiecutter:
-    appveyor: 'yes'
-    c_extension_cython: 'no'
-    c_extension_optional: 'no'
-    c_extension_support: 'no'
-    codacy: 'yes'
-    codeclimate: 'yes'
-    codecov: 'no'
-    command_line_interface: 'no'
-    command_line_interface_bin_name: pytest-cov
-    coveralls: 'no'
+    _extensions:
+    -   jinja2_time.TimeExtension
+    _template: /home/ionel/open-source/cookiecutter-pylibrary
+    allow_tests_inside_package: no
+    appveyor: yes
+    c_extension_function: '-'
+    c_extension_module: '-'
+    c_extension_optional: no
+    c_extension_support: no
+    c_extension_test_pypi: no
+    c_extension_test_pypi_username: '-'
+    codacy: no
+    codacy_projectid: '[Get ID from https://app.codacy.com/app/ionelmc/pytest-cov/settings]'
+    codeclimate: no
+    codecov: no
+    command_line_interface: no
+    command_line_interface_bin_name: '-'
+    coveralls: no
+    coveralls_token: '[Required for Appveyor, take it from https://coveralls.io/github/ionelmc/pytest-cov]'
     distribution_name: pytest-cov
     email: contact@ionelmc.ro
     full_name: Ionel Cristian Mărieș
-    github_username: pytest-dev
-    landscape: 'yes'
+    landscape: no
+    license: MIT license
+    linter: flake8
     package_name: pytest_cov
+    pre_commit: yes
     project_name: pytest-cov
-    project_short_description: This plugin produces coverage reports. It supports
-        centralised testing and distributed testing in both load and each modes. It
-        also supports coverage of subprocesses.
-    release_date: '2016-10-10'
+    project_short_description: This plugin produces coverage reports. It supports centralised testing and distributed testing in both load and each modes. It also supports coverage of subprocesses.
+    pypi_badge: yes
+    pypi_disable_upload: no
+    release_date: '2020-06-12'
+    repo_hosting: github.com
+    repo_hosting_domain: github.com
     repo_name: pytest-cov
-    requiresio: 'yes'
-    scrutinizer: 'yes'
-    sphinx_doctest: 'no'
+    repo_username: pytest-dev
+    requiresio: yes
+    scrutinizer: no
+    setup_py_uses_setuptools_scm: no
+    setup_py_uses_test_runner: no
+    sphinx_docs: yes
+    sphinx_docs_hosting: https://pytest-cov.readthedocs.io/
+    sphinx_doctest: no
     sphinx_theme: sphinx-py3doc-enhanced-theme
-    test_matrix_configurator: 'no'
-    test_matrix_separate_coverage: 'no'
+    test_matrix_configurator: no
+    test_matrix_separate_coverage: no
     test_runner: pytest
-    travis: 'yes'
-    version: 2.4.0
+    travis: yes
+    travis_osx: no
+    version: 2.10.0
     website: http://blog.ionelmc.ro
-    year: now
+    year_from: '2010'
+    year_to: '2020'

.editorconfig

@@ -1,4 +1,4 @@
-# see http://editorconfig.org
+# see https://editorconfig.org/
 root = true
 
 [*]
@@ -11,3 +11,6 @@ charset = utf-8
 
 [*.{bat,cmd,ps1}]
 end_of_line = crlf
+
+[*.{yml,yaml}]
+indent_size = 2

.github/ISSUE_TEMPLATE/bug_report.md

@@ -29,4 +29,3 @@ If you paste raw code make sure you quote it, eg:
 def foobar():
     pass
 ```
-

.gitignore

@@ -1,4 +1,5 @@
 *.py[cod]
+__pycache__
 
 # C extensions
 *.so
@@ -21,6 +22,7 @@ lib
 lib64
 venv*/
 pyvenv*/
+pip-wheel-metadata/
 
 # Installer logs
 pip-log.txt
@@ -29,6 +31,7 @@ pip-log.txt
 .coverage
 .tox
 .coverage.*
+.pytest_cache/
 nosetests.xml
 coverage.xml
 htmlcov
@@ -59,6 +62,10 @@ docs/_build
 .env
 .cache
 .pytest
+.benchmarks
 .bootstrap
 .appveyor.token
 *.bak
+
+# Mypy Cache
+.mypy_cache/

.pre-commit-config.yaml

@@ -0,0 +1,20 @@
+# To install the git pre-commit hook run:
+#   pre-commit install
+# To update the pre-commit hooks run:
+#   pre-commit install-hooks
+exclude: '^(src/.*\.pth|\.tox|ci/templates|\.bumpversion\.cfg)(/|$)'
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: master
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: debug-statements
+  - repo: https://github.com/timothycrosley/isort
+    rev: master
+    hooks:
+      - id: isort
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: master
+    hooks:
+      - id: flake8

.readthedocs.yml

@@ -7,3 +7,5 @@ python:
   version: 3
   install:
     - requirements: docs/requirements.txt
+    - method: pip
+      path: .

.travis.yml

@@ -22,59 +22,67 @@ jobs:
     - stage: tests
       env: TOXENV=py27-pytest46-xdist27-coverage45
       python: '2.7'
-    - env: TOXENV=py27-pytest46-xdist27-coverage51
+    - env: TOXENV=py27-pytest46-xdist27-coverage52
       python: '2.7'
     - env: TOXENV=py35-pytest46-xdist27-coverage45
       python: '3.5'
-    - env: TOXENV=py35-pytest46-xdist27-coverage51
+    - env: TOXENV=py35-pytest46-xdist27-coverage52
       python: '3.5'
     - env: TOXENV=py36-pytest46-xdist27-coverage45
       python: '3.6'
-    - env: TOXENV=py36-pytest46-xdist27-coverage51
+    - env: TOXENV=py36-pytest46-xdist27-coverage52
       python: '3.6'
     - env: TOXENV=py37-pytest46-xdist27-coverage45
       python: '3.7'
-    - env: TOXENV=py37-pytest46-xdist27-coverage51
+    - env: TOXENV=py37-pytest46-xdist27-coverage52
       python: '3.7'
     - env: TOXENV=pypy-pytest46-xdist27-coverage45
       python: 'pypy'
-    - env: TOXENV=pypy-pytest46-xdist27-coverage51
+    - env: TOXENV=pypy-pytest46-xdist27-coverage52
       python: 'pypy'
     - env: TOXENV=pypy3-pytest46-xdist27-coverage45
       python: 'pypy3'
-    - env: TOXENV=pypy3-pytest46-xdist27-coverage51
+    - env: TOXENV=pypy3-pytest46-xdist27-coverage52
       python: 'pypy3'
-    - env: TOXENV=py36-pytest46-xdist32-coverage45
+    - env: TOXENV=py36-pytest46-xdist33-coverage45
       python: '3.6'
-    - env: TOXENV=py36-pytest46-xdist32-coverage51
+    - env: TOXENV=py36-pytest46-xdist33-coverage52
       python: '3.6'
-    - env: TOXENV=py36-pytest54-xdist32-coverage45
+    - env: TOXENV=py36-pytest54-xdist33-coverage45
       python: '3.6'
-    - env: TOXENV=py36-pytest54-xdist32-coverage51
+    - env: TOXENV=py36-pytest54-xdist33-coverage52
       python: '3.6'
-    - env: TOXENV=py37-pytest46-xdist32-coverage45
+    - env: TOXENV=py37-pytest46-xdist33-coverage45
       python: '3.7'
-    - env: TOXENV=py37-pytest46-xdist32-coverage51
+    - env: TOXENV=py37-pytest46-xdist33-coverage52
       python: '3.7'
-    - env: TOXENV=py37-pytest54-xdist32-coverage45
+    - env: TOXENV=py37-pytest54-xdist33-coverage45
       python: '3.7'
-    - env: TOXENV=py37-pytest54-xdist32-coverage51
+    - env: TOXENV=py37-pytest54-xdist33-coverage52
       python: '3.7'
-    - env: TOXENV=py38-pytest46-xdist32-coverage45
+    - env: TOXENV=py38-pytest46-xdist33-coverage45
       python: '3.8'
-    - env: TOXENV=py38-pytest46-xdist32-coverage51
+    - env: TOXENV=py38-pytest46-xdist33-coverage52
       python: '3.8'
-    - env: TOXENV=py38-pytest54-xdist32-coverage45
+    - env: TOXENV=py38-pytest54-xdist33-coverage45
       python: '3.8'
-    - env: TOXENV=py38-pytest54-xdist32-coverage51
+    - env: TOXENV=py38-pytest54-xdist33-coverage52
       python: '3.8'
-    - env: TOXENV=pypy3-pytest46-xdist32-coverage45
+    - env: TOXENV=pypy3-pytest46-xdist33-coverage45
       python: 'pypy3'
-    - env: TOXENV=pypy3-pytest46-xdist32-coverage51
+    - env: TOXENV=pypy3-pytest46-xdist33-coverage52
       python: 'pypy3'
-    - env: TOXENV=pypy3-pytest54-xdist32-coverage45
+    - env: TOXENV=pypy3-pytest54-xdist33-coverage45
       python: 'pypy3'
-    - env: TOXENV=pypy3-pytest54-xdist32-coverage51
+    - env: TOXENV=pypy3-pytest54-xdist33-coverage52
+      python: 'pypy3'
+    - env: TOXENV=py36-pytest60-xdist200-coverage52
+      python: '3.6'
+    - env: TOXENV=py37-pytest60-xdist200-coverage52
+      python: '3.7'
+    - env: TOXENV=py38-pytest60-xdist200-coverage52
+      python: '3.8'
+    - env: TOXENV=pypy3-pytest60-xdist200-coverage52
       python: 'pypy3'
 
     - stage: examples
@@ -91,7 +99,7 @@ before_install:
   - uname -a
   - lsb_release -a
 install:
-  - pip install tox
+  - python -mpip install --progress-bar=off tox -rci/requirements.txt
   - virtualenv --version
   - easy_install --version
   - pip --version

AUTHORS.rst

@@ -38,3 +38,4 @@ Authors
 * Hugo van Kemenade - https://github.com/hugovk
 * Michael Manganiello - https://github.com/adamantike
 * Anders Hovmöller - https://github.com/boxed
+* Zac Hatfield-Dodds - https://zhd.dev

CHANGELOG.rst

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+2.10.1 (2020-08-14)
+-------------------
+
+* Support for ``pytest-xdist`` 2.0, which breaks compatibility with ``pytest-xdist`` before 1.22.3 (from 2017).
+  Contributed by Zac Hatfield-Dodds in `#412 <https://github.com/pytest-dev/pytest-cov/pull/412>`_.
+* Fixed the ``LocalPath has no attribute startswith`` failure that occurred when using the ``pytester`` plugin
+  in inline mode.
+
 2.10.0 (2020-06-12)
 -------------------
 
@@ -124,7 +132,7 @@ Changelog
 2.6.0 (2018-09-03)
 ------------------
 
-* Dropped support for Python < 3.4, Pytest < 3.5 and Coverage < 4.4.
+* Dropped support for Python 3 < 3.4, Pytest < 3.5 and Coverage < 4.4.
 * Fixed some documentation formatting. Contributed by Jean Jordaan and Julian.
 * Added an example with ``addopts`` in documentation. Contributed by Samuel Giffard in
   `#195 <https://github.com/pytest-dev/pytest-cov/pull/195>`_.

CONTRIBUTING.rst

@@ -41,15 +41,15 @@ To set up `pytest-cov` for local development:
    (look for the "Fork" button).
 2. Clone your fork locally::
 
-    git clone git@github.com:your_name_here/pytest-cov.git
+    git clone git@github.com:YOURGITHUBNAME/pytest-cov.git
 
 3. Create a branch for local development::
 
     git checkout -b name-of-your-bugfix-or-feature
 
    Now you can make your changes locally.
 
-4. When you're done making changes, run all the checks, doc builder and spell checker with `tox <http://tox.readthedocs.io/en/latest/install.html>`_ one command::
+4. When you're done making changes run all the checks and docs builder with `tox <https://tox.readthedocs.io/en/latest/install.html>`_ one command::
 
     tox
 
@@ -85,6 +85,6 @@ To run a subset of tests::
 
     tox -e envname -- pytest -k test_myfeature
 
-To run all the test environments in *parallel* (you need to ``pip install detox``)::
+To run the test environments in *parallel*::
 
-    detox
+    tox -p auto