From 9ef608ef76a758b34550a977cc3ebe521986cc4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= Date: Mon, 26 Apr 2021 17:44:27 +0200 Subject: [PATCH] "fix" a couple of http -> https redirects Found with urli-fix . -a http: -i pytest --- CONTRIBUTING.rst | 4 +-- doc/en/announce/release-2.1.0.rst | 2 +- doc/en/announce/release-2.1.1.rst | 2 +- doc/en/announce/release-2.1.2.rst | 2 +- doc/en/builtin.rst | 2 +- doc/en/changelog.rst | 6 ++-- doc/en/conf.py | 2 +- doc/en/contact.rst | 10 +++--- doc/en/explanation/flaky.rst | 2 +- doc/en/explanation/goodpractices.rst | 2 +- doc/en/getting-started.rst | 2 +- doc/en/how-to/failures.rst | 2 +- doc/en/how-to/fixtures.rst | 2 +- doc/en/how-to/monkeypatch.rst | 2 +- doc/en/how-to/output.rst | 4 +-- doc/en/how-to/plugins.rst | 2 +- doc/en/how-to/xunit_setup.rst | 2 +- doc/en/projects.rst | 46 ++++++++++++++-------------- doc/en/talks.rst | 12 ++++---- src/_pytest/cacheprovider.py | 2 +- src/_pytest/recwarn.py | 2 +- testing/test_pathlib.py | 2 +- 22 files changed, 57 insertions(+), 57 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index bbc341e0f..2c7d253e7 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -160,7 +160,7 @@ the following: - an issue tracker for bug reports and enhancement requests. -- a `changelog `_. +- a `changelog `_. If no contributor strongly objects and two agree, the repository can then be transferred to the ``pytest-dev`` organisation. @@ -259,7 +259,7 @@ Here is a simple overview, with pytest-specific bits: Tox is used to run all the tests and will automatically setup virtualenvs to run the tests in. - (will implicitly use http://www.virtualenv.org/en/latest/):: + (will implicitly use https://virtualenv.pypa.io/en/latest/):: $ pip install tox diff --git a/doc/en/announce/release-2.1.0.rst b/doc/en/announce/release-2.1.0.rst index 29463ab53..f8bc88c16 100644 --- a/doc/en/announce/release-2.1.0.rst +++ b/doc/en/announce/release-2.1.0.rst @@ -24,7 +24,7 @@ If you want to install or upgrade pytest, just type one of:: easy_install -U pytest best, -holger krekel / http://merlinux.eu +holger krekel / https://merlinux.eu/ Changes between 2.0.3 and 2.1.0 ---------------------------------------------- diff --git a/doc/en/announce/release-2.1.1.rst b/doc/en/announce/release-2.1.1.rst index c2285eba9..369428ed2 100644 --- a/doc/en/announce/release-2.1.1.rst +++ b/doc/en/announce/release-2.1.1.rst @@ -20,7 +20,7 @@ If you want to install or upgrade pytest, just type one of:: easy_install -U pytest best, -holger krekel / http://merlinux.eu +holger krekel / https://merlinux.eu/ Changes between 2.1.0 and 2.1.1 ---------------------------------------------- diff --git a/doc/en/announce/release-2.1.2.rst b/doc/en/announce/release-2.1.2.rst index 1975f368a..a3c0c1a38 100644 --- a/doc/en/announce/release-2.1.2.rst +++ b/doc/en/announce/release-2.1.2.rst @@ -19,7 +19,7 @@ If you want to install or upgrade pytest, just type one of:: easy_install -U pytest best, -holger krekel / http://merlinux.eu +holger krekel / https://merlinux.eu/ Changes between 2.1.1 and 2.1.2 ---------------------------------------- diff --git a/doc/en/builtin.rst b/doc/en/builtin.rst index ad6efd657..f0a6eedb1 100644 --- a/doc/en/builtin.rst +++ b/doc/en/builtin.rst @@ -144,7 +144,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a recwarn Return a :class:`WarningsRecorder` instance that records all warnings emitted by test functions. - See http://docs.python.org/library/warnings.html for information + See https://docs.python.org/library/warnings.html for information on warning categories. tmpdir_factory [session scope] diff --git a/doc/en/changelog.rst b/doc/en/changelog.rst index 0ff7ede3d..18a288469 100644 --- a/doc/en/changelog.rst +++ b/doc/en/changelog.rst @@ -3108,12 +3108,12 @@ Features will not issue the warning. -- `#3632 `_: Richer equality comparison introspection on ``AssertionError`` for objects created using `attrs `__ or `dataclasses `_ (Python 3.7+, `backported to 3.6 `__). +- `#3632 `_: Richer equality comparison introspection on ``AssertionError`` for objects created using `attrs `__ or `dataclasses `_ (Python 3.7+, `backported to 3.6 `__). - `#4278 `_: ``CACHEDIR.TAG`` files are now created inside cache directories. - Those files are part of the `Cache Directory Tagging Standard `__, and can + Those files are part of the `Cache Directory Tagging Standard `__, and can be used by backup or synchronization programs to identify pytest's cache directory as such. @@ -8466,7 +8466,7 @@ Bug fixes: - fixes for making the jython/win32 combination work, note however: jython2.5.1/win32 does not provide a command line launcher, see - http://bugs.jython.org/issue1491 . See pylib install documentation + https://bugs.jython.org/issue1491 . See pylib install documentation for how to work around. - fixes for handling of unicode exception values and unprintable objects diff --git a/doc/en/conf.py b/doc/en/conf.py index d9c1f3c2d..6de2f1fbd 100644 --- a/doc/en/conf.py +++ b/doc/en/conf.py @@ -252,7 +252,7 @@ latex_documents = [ "contents", "pytest.tex", "pytest Documentation", - "holger krekel, trainer and consultant, http://merlinux.eu", + "holger krekel, trainer and consultant, https://merlinux.eu/", "manual", ) ] diff --git a/doc/en/contact.rst b/doc/en/contact.rst index efc6a8f57..c7cf277af 100644 --- a/doc/en/contact.rst +++ b/doc/en/contact.rst @@ -30,19 +30,19 @@ Contact channels consulting. .. _`pytest issue tracker`: https://github.com/pytest-dev/pytest/issues -.. _`old issue tracker`: http://bitbucket.org/hpk42/py-trunk/issues/ +.. _`old issue tracker`: https://bitbucket.org/hpk42/py-trunk/issues/ -.. _`merlinux.eu`: http://merlinux.eu +.. _`merlinux.eu`: https://merlinux.eu/ .. _`get an account`: -.. _tetamap: http://tetamap.wordpress.com +.. _tetamap: https://tetamap.wordpress.com/ -.. _`@pylibcommit`: http://twitter.com/pylibcommit +.. _`@pylibcommit`: https://twitter.com/pylibcommit .. _`Testing in Python`: http://lists.idyll.org/listinfo/testing-in-python -.. _FOAF: http://en.wikipedia.org/wiki/FOAF +.. _FOAF: https://en.wikipedia.org/wiki/FOAF .. _`py-dev`: .. _`development mailing list`: .. _`pytest-dev at python.org (mailing list)`: http://mail.python.org/mailman/listinfo/pytest-dev diff --git a/doc/en/explanation/flaky.rst b/doc/en/explanation/flaky.rst index b6fc1520c..e49ebf210 100644 --- a/doc/en/explanation/flaky.rst +++ b/doc/en/explanation/flaky.rst @@ -113,7 +113,7 @@ Resources * `Eradicating Non-Determinism in Tests `_ by Martin Fowler, 2011 * `No more flaky tests on the Go team `_ by Pavan Sudarshan, 2012 -* `The Build That Cried Broken: Building Trust in your Continuous Integration Tests `_ talk (video) by `Angie Jones `_ at SeleniumConf Austin 2017 +* `The Build That Cried Broken: Building Trust in your Continuous Integration Tests `_ talk (video) by `Angie Jones `_ at SeleniumConf Austin 2017 * `Test and Code Podcast: Flaky Tests and How to Deal with Them `_ by Brian Okken and Anthony Shaw, 2018 * Microsoft: diff --git a/doc/en/explanation/goodpractices.rst b/doc/en/explanation/goodpractices.rst index fe5db9fd1..186beae58 100644 --- a/doc/en/explanation/goodpractices.rst +++ b/doc/en/explanation/goodpractices.rst @@ -231,7 +231,7 @@ Note that this layout also works in conjunction with the ``src`` layout mentione .. _`virtualenv`: https://pypi.org/project/virtualenv/ -.. _`buildout`: http://www.buildout.org/ +.. _`buildout`: http://www.buildout.org/en/latest/ .. _pip: https://pypi.org/project/pip/ .. _`use tox`: diff --git a/doc/en/getting-started.rst b/doc/en/getting-started.rst index 5f2f419e6..373affa15 100644 --- a/doc/en/getting-started.rst +++ b/doc/en/getting-started.rst @@ -71,7 +71,7 @@ The ``[100%]`` refers to the overall progress of running all test cases. After i .. note:: - You can use the ``assert`` statement to verify test expectations. pytest’s `Advanced assertion introspection `_ will intelligently report intermediate values of the assert expression so you can avoid the many names `of JUnit legacy methods `_. + You can use the ``assert`` statement to verify test expectations. pytest’s `Advanced assertion introspection `_ will intelligently report intermediate values of the assert expression so you can avoid the many names `of JUnit legacy methods `_. Run multiple tests ---------------------------------------------------------- diff --git a/doc/en/how-to/failures.rst b/doc/en/how-to/failures.rst index bbb660b22..0a0ec164d 100644 --- a/doc/en/how-to/failures.rst +++ b/doc/en/how-to/failures.rst @@ -24,7 +24,7 @@ Using PDB_ (Python Debugger) with pytest Dropping to PDB_ (Python Debugger) on failures ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. _PDB: http://docs.python.org/library/pdb.html +.. _PDB: https://docs.python.org/library/pdb.html Python comes with a builtin Python debugger called PDB_. ``pytest`` allows one to drop into the PDB_ prompt via a command line option: diff --git a/doc/en/how-to/fixtures.rst b/doc/en/how-to/fixtures.rst index a2eb211e1..1bd4173d9 100644 --- a/doc/en/how-to/fixtures.rst +++ b/doc/en/how-to/fixtures.rst @@ -1578,7 +1578,7 @@ Sometimes test functions do not directly need access to a fixture object. For example, tests may require to operate with an empty directory as the current working directory but otherwise do not care for the concrete directory. Here is how you can use the standard `tempfile -`_ and pytest fixtures to +`_ and pytest fixtures to achieve it. We separate the creation of the fixture into a conftest.py file: diff --git a/doc/en/how-to/monkeypatch.rst b/doc/en/how-to/monkeypatch.rst index f34ba7982..4f9b5aa99 100644 --- a/doc/en/how-to/monkeypatch.rst +++ b/doc/en/how-to/monkeypatch.rst @@ -58,7 +58,7 @@ call ``pkg_resources.fixup_namespace_packages`` and :py:func:`importlib.invalida See the `monkeypatch blog post`_ for some introduction material and a discussion of its motivation. -.. _`monkeypatch blog post`: http://tetamap.wordpress.com/2009/03/03/monkeypatching-in-unit-tests-done-right/ +.. _`monkeypatch blog post`: https://tetamap.wordpress.com//2009/03/03/monkeypatching-in-unit-tests-done-right/ Simple example: monkeypatching functions ---------------------------------------- diff --git a/doc/en/how-to/output.rst b/doc/en/how-to/output.rst index 465681e66..9f922b841 100644 --- a/doc/en/how-to/output.rst +++ b/doc/en/how-to/output.rst @@ -703,11 +703,11 @@ for example ``-x`` if you only want to send one particular failure. pytest --pastebin=all -Currently only pasting to the http://bpaste.net service is implemented. +Currently only pasting to the https://bpaste.net/ service is implemented. .. versionchanged:: 5.2 If creating the URL fails for any reason, a warning is generated instead of failing the entire test suite. -.. _jenkins: http://jenkins-ci.org/ +.. _jenkins: https://jenkins-ci.org diff --git a/doc/en/how-to/plugins.rst b/doc/en/how-to/plugins.rst index 60c442c1f..8af86c16d 100644 --- a/doc/en/how-to/plugins.rst +++ b/doc/en/how-to/plugins.rst @@ -26,7 +26,7 @@ Here is a little annotated list for some popular plugins: for `django`_ apps, using pytest integration. * `pytest-twisted `_: write tests - for `twisted `_ apps, starting a reactor and + for `twisted `_ apps, starting a reactor and processing deferreds from test functions. * `pytest-cov `__: diff --git a/doc/en/how-to/xunit_setup.rst b/doc/en/how-to/xunit_setup.rst index 2269c06e0..7fbe870ed 100644 --- a/doc/en/how-to/xunit_setup.rst +++ b/doc/en/how-to/xunit_setup.rst @@ -116,4 +116,4 @@ Remarks: Now the xunit-style functions are integrated with the fixture mechanism and obey the proper scope rules of fixtures involved in the call. -.. _`unittest.py module`: http://docs.python.org/library/unittest.html +.. _`unittest.py module`: https://docs.python.org/library/unittest.html diff --git a/doc/en/projects.rst b/doc/en/projects.rst index 0720bc9dd..804a0b20a 100644 --- a/doc/en/projects.rst +++ b/doc/en/projects.rst @@ -22,38 +22,38 @@ Project examples Here are some examples of projects using ``pytest`` (please send notes via :ref:`contact`): -* `PyPy `_, Python with a JIT compiler, running over +* `PyPy `_, Python with a JIT compiler, running over `21000 tests `_ * the `MoinMoin `_ Wiki Engine * `sentry `_, realtime app-maintenance and exception tracking -* `Astropy `_ and `affiliated packages `_ -* `tox `_, virtualenv/Hudson integration tool -* `PyPM `_ ActiveState's package manager -* `Fom `_ a fluid object mapper for FluidDB +* `Astropy `_ and `affiliated packages `_ +* `tox `_, virtualenv/Hudson integration tool +* `PyPM `_ ActiveState's package manager +* `Fom `_ a fluid object mapper for FluidDB * `applib `_ cross-platform utilities * `six `_ Python 2 and 3 compatibility utilities -* `pediapress `_ MediaWiki articles +* `pediapress `_ MediaWiki articles * `mwlib `_ mediawiki parser and utility library -* `The Translate Toolkit `_ for localization and conversion -* `execnet `_ rapid multi-Python deployment +* `The Translate Toolkit `_ for localization and conversion +* `execnet `_ rapid multi-Python deployment * `pylib `_ cross-platform path, IO, dynamic code library * `bbfreeze `_ create standalone executables from Python scripts * `pdb++ `_ a fancier version of PDB * `pudb `_ full-screen console debugger for python -* `py-s3fuse `_ Amazon S3 FUSE based filesystem +* `py-s3fuse `_ Amazon S3 FUSE based filesystem * `waskr `_ WSGI Stats Middleware * `guachi `_ global persistent configs for Python modules * `Circuits `_ lightweight Event Driven Framework -* `pygtk-helpers `_ easy interaction with PyGTK +* `pygtk-helpers `_ easy interaction with PyGTK * `QuantumCore `_ statusmessage and repoze openid plugin -* `pydataportability `_ libraries for managing the open web -* `XIST `_ extensible HTML/XML generator +* `pydataportability `_ libraries for managing the open web +* `XIST `_ extensible HTML/XML generator * `tiddlyweb `_ optionally headless, extensible RESTful datastore -* `fancycompleter `_ for colorful tab-completion -* `Paludis `_ tools for Gentoo Paludis package manager -* `Gerald `_ schema comparison tool -* `abjad `_ Python API for Formalized Score control -* `bu `_ a microscopic build system +* `fancycompleter `_ for colorful tab-completion +* `Paludis `_ tools for Gentoo Paludis package manager +* `Gerald `_ schema comparison tool +* `abjad `_ Python API for Formalized Score control +* `bu `_ a microscopic build system * `katcp `_ Telescope communication protocol over Twisted * `kss plugin timer `_ * `pyudev `_ a pure Python binding to the Linux library libudev @@ -71,13 +71,13 @@ These projects help integrate ``pytest`` into other Python frameworks: Some organisations using pytest ----------------------------------- -* `Square Kilometre Array, Cape Town `_ +* `Square Kilometre Array, Cape Town `_ * `Some Mozilla QA people `_ use pytest to distribute their Selenium tests -* `Shootq `_ -* `Stups department of Heinrich Heine University Duesseldorf `_ +* `Shootq `_ +* `Stups department of Heinrich Heine University Duesseldorf `_ * cellzome -* `Open End, Gothenborg `_ +* `Open End, Gothenborg `_ * `Laboratory of Bioinformatics, Warsaw `_ -* `merlinux, Germany `_ -* `ESSS, Brazil `_ +* `merlinux, Germany `_ +* `ESSS, Brazil `_ * many more ... (please be so kind to send a note via :ref:`contact`) diff --git a/doc/en/talks.rst b/doc/en/talks.rst index 216ccb8dd..6843c82ba 100644 --- a/doc/en/talks.rst +++ b/doc/en/talks.rst @@ -70,8 +70,8 @@ Talks and blog postings - `pytest introduction from Brian Okken (January 2013) `_ -- pycon australia 2012 pytest talk from Brianna Laugher (`video `_, `slides `_, `code `_) -- `pycon 2012 US talk video from Holger Krekel `_ +- pycon australia 2012 pytest talk from Brianna Laugher (`video `_, `slides `_, `code `_) +- `pycon 2012 US talk video from Holger Krekel `_ - `monkey patching done right`_ (blog post, consult `monkeypatch plugin`_ for up-to-date API) @@ -101,9 +101,9 @@ Plugin specific examples: .. _`many examples in the docs for plugins`: plugins.html .. _`monkeypatch plugin`: monkeypatch.html .. _`application setup in test functions with fixtures`: fixture.html#interdependent-fixtures -.. _`simultaneously test your code on all platforms`: http://tetamap.wordpress.com/2009/03/23/new-simultanously-test-your-code-on-all-platforms/ -.. _`monkey patching done right`: http://tetamap.wordpress.com/2009/03/03/monkeypatching-in-unit-tests-done-right/ -.. _`putting test-hooks into local or global plugins`: http://tetamap.wordpress.com/2009/05/14/putting-test-hooks-into-local-and-global-plugins/ -.. _`parametrizing tests, generalized`: http://tetamap.wordpress.com/2009/05/13/parametrizing-python-tests-generalized/ +.. _`simultaneously test your code on all platforms`: https://tetamap.wordpress.com//2009/03/23/new-simultanously-test-your-code-on-all-platforms/ +.. _`monkey patching done right`: https://tetamap.wordpress.com//2009/03/03/monkeypatching-in-unit-tests-done-right/ +.. _`putting test-hooks into local or global plugins`: https://tetamap.wordpress.com/2009/05/14/putting-test-hooks-into-local-and-global-plugins/ +.. _`parametrizing tests, generalized`: https://tetamap.wordpress.com/2009/05/13/parametrizing-python-tests-generalized/ .. _`generating parametrized tests with fixtures`: parametrize.html#test-generators .. _`test generators and cached setup`: http://bruynooghe.blogspot.com/2010/06/pytest-test-generators-and-cached-setup.html diff --git a/src/_pytest/cacheprovider.py b/src/_pytest/cacheprovider.py index 62112c6e3..f442ea89b 100755 --- a/src/_pytest/cacheprovider.py +++ b/src/_pytest/cacheprovider.py @@ -50,7 +50,7 @@ CACHEDIR_TAG_CONTENT = b"""\ Signature: 8a477f597d28d172789f06886806bc55 # This file is a cache directory tag created by pytest. # For information about cache directory tags, see: -# http://www.bford.info/cachedir/spec.html +# https://bford.info/cachedir/spec.html """ diff --git a/src/_pytest/recwarn.py b/src/_pytest/recwarn.py index eb59fee29..bc3a2835e 100644 --- a/src/_pytest/recwarn.py +++ b/src/_pytest/recwarn.py @@ -28,7 +28,7 @@ T = TypeVar("T") def recwarn() -> Generator["WarningsRecorder", None, None]: """Return a :class:`WarningsRecorder` instance that records all warnings emitted by test functions. - See http://docs.python.org/library/warnings.html for information + See https://docs.python.org/library/warnings.html for information on warning categories. """ wrec = WarningsRecorder(_ispytest=True) diff --git a/testing/test_pathlib.py b/testing/test_pathlib.py index 11db4c5c6..2cd1e6355 100644 --- a/testing/test_pathlib.py +++ b/testing/test_pathlib.py @@ -164,7 +164,7 @@ class TestImportPath: import_path(tmp_path.joinpath("b", "test_x123.py"), root=tmp_path) def test_messy_name(self, tmp_path: Path) -> None: - # http://bitbucket.org/hpk42/py-trunk/issue/129 + # https://bitbucket.org/hpk42/py-trunk/issue/129 path = tmp_path / "foo__init__.py" path.touch() module = import_path(path, root=tmp_path)