From b0a32da0b55fe973f02bd0bd835b52434a2f7bc3 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 28 Aug 2018 14:27:11 -0700 Subject: [PATCH 01/13] Use https; save a redirect --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 97b21898e..5c64eba2b 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ -.. image:: http://docs.pytest.org/en/latest/_static/pytest1.png - :target: http://docs.pytest.org +.. image:: https://docs.pytest.org/en/latest/_static/pytest1.png + :target: https://docs.pytest.org/en/latest/ :align: center :alt: pytest From 2e090896d52d8d3340e2218ed2101748bd6b0a5b Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 28 Aug 2018 14:34:22 -0700 Subject: [PATCH 02/13] Use https --- README.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.rst b/README.rst index 5c64eba2b..97ab784cd 100644 --- a/README.rst +++ b/README.rst @@ -66,23 +66,23 @@ To execute it:: ========================== 1 failed in 0.04 seconds =========================== -Due to ``pytest``'s detailed assertion introspection, only plain ``assert`` statements are used. See `getting-started `_ for more examples. +Due to ``pytest``'s detailed assertion introspection, only plain ``assert`` statements are used. See `getting-started `_ for more examples. Features -------- -- Detailed info on failing `assert statements `_ (no need to remember ``self.assert*`` names); +- Detailed info on failing `assert statements `_ (no need to remember ``self.assert*`` names); - `Auto-discovery - `_ + `_ of test modules and functions; -- `Modular fixtures `_ for +- `Modular fixtures `_ for managing small or parametrized long-lived test resources; -- Can run `unittest `_ (or trial), - `nose `_ test suites out of the box; +- Can run `unittest `_ (or trial), + `nose `_ test suites out of the box; - Python 2.7, Python 3.4+, PyPy 2.3, Jython 2.5 (untested); @@ -92,7 +92,7 @@ Features Documentation ------------- -For full documentation, including installation, tutorials and PDF documents, please see http://docs.pytest.org. +For full documentation, including installation, tutorials and PDF documents, please see https://docs.pytest.org/en/latest/. Bugs/Requests @@ -104,7 +104,7 @@ Please use the `GitHub issue tracker `__ page for fixes and enhancements of each version. +Consult the `Changelog `__ page for fixes and enhancements of each version. License From bde3d1a0cde50be7beee8428fd7d614e73f4b6b7 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 28 Aug 2018 14:34:39 -0700 Subject: [PATCH 03/13] Use https; save a redirect --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7039ae604..6207ad09b 100644 --- a/setup.py +++ b/setup.py @@ -92,7 +92,7 @@ def main(): description="pytest: simple powerful testing with Python", long_description=long_description, use_scm_version={"write_to": "src/_pytest/_version.py"}, - url="http://pytest.org", + url="https://docs.pytest.org/en/latest/", project_urls={ "Source": "https://github.com/pytest-dev/pytest", "Tracker": "https://github.com/pytest-dev/pytest/issues", From f19cfbb825d9cd824939138a93f9e12abdd68255 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 28 Aug 2018 14:35:08 -0700 Subject: [PATCH 04/13] Fix 404 to a somewhat better historical note --- doc/en/funcarg_compare.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/en/funcarg_compare.rst b/doc/en/funcarg_compare.rst index c29ba1f3c..5403da2f2 100644 --- a/doc/en/funcarg_compare.rst +++ b/doc/en/funcarg_compare.rst @@ -7,7 +7,7 @@ pytest-2.3: reasoning for fixture/funcarg evolution **Target audience**: Reading this document requires basic knowledge of python testing, xUnit setup methods and the (previous) basic pytest -funcarg mechanism, see http://pytest.org/2.2.4/funcargs.html +funcarg mechanism, see https://docs.pytest.org/en/latest/historical-notes.html#funcargs-and-pytest-funcarg. If you are new to pytest, then you can simply ignore this section and read the other sections. From 00e0b43010694691db8a2eb35ff00f04a1f9d715 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 28 Aug 2018 14:36:47 -0700 Subject: [PATCH 05/13] Use https, save a redirect --- scripts/release.minor.rst | 4 ++-- scripts/release.patch.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/release.minor.rst b/scripts/release.minor.rst index bdd8282cf..d0256b71c 100644 --- a/scripts/release.minor.rst +++ b/scripts/release.minor.rst @@ -9,11 +9,11 @@ against itself, passing on many different interpreters and platforms. This release contains a number of bugs fixes and improvements, so users are encouraged to take a look at the CHANGELOG: - http://doc.pytest.org/en/latest/changelog.html + https://doc.pytest.org/en/latest/changelog.html For complete documentation, please visit: - http://docs.pytest.org + https://docs.pytest.org/en/latest/ As usual, you can upgrade from pypi via: diff --git a/scripts/release.patch.rst b/scripts/release.patch.rst index 1982dc353..f46aecf7a 100644 --- a/scripts/release.patch.rst +++ b/scripts/release.patch.rst @@ -7,7 +7,7 @@ This is a bug-fix release, being a drop-in replacement. To upgrade:: pip install --upgrade pytest -The full changelog is available at http://doc.pytest.org/en/latest/changelog.html. +The full changelog is available at https://doc.pytest.org/en/latest/changelog.html. Thanks to all who contributed to this release, among them: From e040fd20a379b4e9be4de71ce61e0d31216ee87c Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 28 Aug 2018 14:38:55 -0700 Subject: [PATCH 06/13] Use https, save a redirect --- src/_pytest/python.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/_pytest/python.py b/src/_pytest/python.py index 977b07442..f175394a8 100644 --- a/src/_pytest/python.py +++ b/src/_pytest/python.py @@ -173,13 +173,14 @@ def pytest_configure(config): "or a list of tuples of values if argnames specifies multiple names. " "Example: @parametrize('arg1', [1,2]) would lead to two calls of the " "decorated test function, one with arg1=1 and another with arg1=2." - "see http://pytest.org/latest/parametrize.html for more info and " - "examples.", + "see https://docs.pytest.org/en/latest/parametrize.html for more info " + "and examples.", ) config.addinivalue_line( "markers", "usefixtures(fixturename1, fixturename2, ...): mark tests as needing " - "all of the specified fixtures. see http://pytest.org/latest/fixture.html#usefixtures ", + "all of the specified fixtures. see " + "https://docs.pytest.org/en/latest/fixture.html#usefixtures ", ) From 67c3c28877548b6d3a3c83d1dc090d9760120b14 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 28 Aug 2018 14:39:32 -0700 Subject: [PATCH 07/13] Use https, save a redirect --- src/_pytest/skipping.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/_pytest/skipping.py b/src/_pytest/skipping.py index 64bc770ae..90afd6de8 100644 --- a/src/_pytest/skipping.py +++ b/src/_pytest/skipping.py @@ -51,7 +51,7 @@ def pytest_configure(config): "results in a True value. Evaluation happens within the " "module global context. Example: skipif('sys.platform == \"win32\"') " "skips the test if we are on the win32 platform. see " - "http://pytest.org/latest/skipping.html", + "https://docs.pytest.org/en/latest/skipping.html", ) config.addinivalue_line( "markers", @@ -61,7 +61,7 @@ def pytest_configure(config): "and run=False if you don't even want to execute the test function. " "If only specific exception(s) are expected, you can list them in " "raises, and if the test fails in other ways, it will be reported as " - "a true failure. See http://pytest.org/latest/skipping.html", + "a true failure. See https://docs.pytest.org/en/latest/skipping.html", ) From 28c3ef1c7713e62b0ef392c1000d8c0f1d892fcc Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 28 Aug 2018 14:40:20 -0700 Subject: [PATCH 08/13] Use https, save a redirect, fix hostname --- src/_pytest/terminal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_pytest/terminal.py b/src/_pytest/terminal.py index 155a33aca..746d08c47 100644 --- a/src/_pytest/terminal.py +++ b/src/_pytest/terminal.py @@ -691,7 +691,7 @@ class TerminalReporter(object): indented = "\n".join(" " + x for x in lines) self._tw.line(indented) self._tw.line() - self._tw.line("-- Docs: http://doc.pytest.org/en/latest/warnings.html") + self._tw.line("-- Docs: https://docs.pytest.org/en/latest/warnings.html") def summary_passes(self): if self.config.option.tbstyle != "no": From 103d980b2d3969fc9aa59ef7514b36c91260d809 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 28 Aug 2018 14:41:13 -0700 Subject: [PATCH 09/13] Use https, save a redirect --- src/_pytest/warnings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_pytest/warnings.py b/src/_pytest/warnings.py index f2f23a6e2..3a93f92f3 100644 --- a/src/_pytest/warnings.py +++ b/src/_pytest/warnings.py @@ -53,7 +53,7 @@ def pytest_configure(config): config.addinivalue_line( "markers", "filterwarnings(warning): add a warning filter to the given test. " - "see http://pytest.org/latest/warnings.html#pytest-mark-filterwarnings ", + "see https://docs.pytest.org/en/latest/warnings.html#pytest-mark-filterwarnings ", ) From 8ef21f56d35dc70000018387d7b6ae99660ff608 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 28 Aug 2018 14:42:16 -0700 Subject: [PATCH 10/13] Fix 404 --- testing/deprecated_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/deprecated_test.py b/testing/deprecated_test.py index 41907503e..966de66b2 100644 --- a/testing/deprecated_test.py +++ b/testing/deprecated_test.py @@ -116,7 +116,7 @@ def test_resultlog_is_deprecated(testdir): result.stdout.fnmatch_lines( [ "*--result-log is deprecated and scheduled for removal in pytest 4.0*", - "*See https://docs.pytest.org/*/usage.html#creating-resultlog-format-files for more information*", + "*See https://docs.pytest.org/en/latest/usage.html#creating-resultlog-format-files for more information*", ] ) From eab5020e248f80a141cf63d1fd241e839e1702c3 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 28 Aug 2018 14:45:04 -0700 Subject: [PATCH 11/13] Fix hostname --- scripts/release.minor.rst | 2 +- scripts/release.patch.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/release.minor.rst b/scripts/release.minor.rst index d0256b71c..9a488edbc 100644 --- a/scripts/release.minor.rst +++ b/scripts/release.minor.rst @@ -9,7 +9,7 @@ against itself, passing on many different interpreters and platforms. This release contains a number of bugs fixes and improvements, so users are encouraged to take a look at the CHANGELOG: - https://doc.pytest.org/en/latest/changelog.html + https://docs.pytest.org/en/latest/changelog.html For complete documentation, please visit: diff --git a/scripts/release.patch.rst b/scripts/release.patch.rst index f46aecf7a..b1ad2dbd7 100644 --- a/scripts/release.patch.rst +++ b/scripts/release.patch.rst @@ -7,7 +7,7 @@ This is a bug-fix release, being a drop-in replacement. To upgrade:: pip install --upgrade pytest -The full changelog is available at https://doc.pytest.org/en/latest/changelog.html. +The full changelog is available at https://docs.pytest.org/en/latest/changelog.html. Thanks to all who contributed to this release, among them: From 37a65684d62977b9c10df1349eae241d5ed5fec6 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 28 Aug 2018 14:51:27 -0700 Subject: [PATCH 12/13] add changelog entry --- changelog/3902.doc.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/3902.doc.rst diff --git a/changelog/3902.doc.rst b/changelog/3902.doc.rst new file mode 100644 index 000000000..177ec6de6 --- /dev/null +++ b/changelog/3902.doc.rst @@ -0,0 +1 @@ +Fix pytest.org links \ No newline at end of file From bf47033169cdaa30b7d8d16a5c08468a12334719 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Tue, 28 Aug 2018 21:05:34 -0300 Subject: [PATCH 13/13] Fix linting --- changelog/3902.doc.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/3902.doc.rst b/changelog/3902.doc.rst index 177ec6de6..8e1472c8c 100644 --- a/changelog/3902.doc.rst +++ b/changelog/3902.doc.rst @@ -1 +1 @@ -Fix pytest.org links \ No newline at end of file +Fix pytest.org links