Merge branch 'master' into yaml

Author: Michael Howitz

.travis.yml

@@ -22,4 +22,4 @@ script:
        [[ "$TRAVIS_PYTHON_VERSION" != pypy* ]]; then
       pre-commit run --all-files --show-diff-on-failure;
     fi
-  - py.test
+  - pytest

CONTRIBUTING.rst

@@ -30,7 +30,7 @@ Preparing Pull Requests
 #. Install `tox <https://tox.readthedocs.io/en/latest/>`_::
 
    Tox is used to run all the tests and will automatically setup virtualenvs
-   to run the tests in. Implicitly http://www.virtualenv.org/en/latest/ is used::
+   to run the tests in. Implicitly https://virtualenv.pypa.io/ is used::
 
     $ pip install tox
     $ tox -e linting,py37

LICENSE

@@ -1,3 +1,3 @@
 This Source Code Form is subject to the terms of the Mozilla Public
 License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
+file, You can obtain one at https://www.mozilla.org/MPL/2.0/.

README.rst

@@ -1,7 +1,7 @@
 pytest-rerunfailures
 ====================
 
-pytest-rerunfailures is a plugin for `py.test <http://pytest.org>`_ that
+pytest-rerunfailures is a plugin for `pytest <https://pytest.org>`_ that
 re-runs tests to eliminate intermittent failures.
 
 .. image:: https://img.shields.io/badge/license-MPL%202.0-blue.svg
@@ -135,8 +135,8 @@ Compatibility
 Resources
 ---------
 
-- `Issue Tracker <http://github.com/pytest-dev/pytest-rerunfailures/issues>`_
-- `Code <http://github.com/pytest-dev/pytest-rerunfailures/>`_
+- `Issue Tracker <https://github.com/pytest-dev/pytest-rerunfailures/issues>`_
+- `Code <https://github.com/pytest-dev/pytest-rerunfailures/>`_
 
 Development
 -----------

pytest_rerunfailures.py

@@ -92,7 +92,7 @@ def _set_resultlog(config, resultlog):
 
 
 # making sure the options make sense
-# should run before / at the begining of pytest_cmdline_main
+# should run before / at the beginning of pytest_cmdline_main
 def check_options(config):
     val = config.getvalue
     if not val("collectonly"):

tox.ini

@@ -1,6 +1,6 @@
 # Tox (https://tox.readthedocs.io/en/latest/) is a tool for running tests
 # in multiple virtualenvs. This configuration file will run the
-# test suite on all supported python versions. To use it, "pip install tox"
+# test suite on all supported Python versions. To use it, "pip install tox"
 # and then run "tox" from this directory.
 
 [flake8]
@@ -15,7 +15,7 @@ envlist =
 minversion = 3.17.1
 
 [testenv]
-commands = py.test test_pytest_rerunfailures.py {posargs}
+commands = pytest test_pytest_rerunfailures.py {posargs}
 deps =
     pytest50: pytest==5.0.*
     pytest51: pytest==5.1.*