diff --git a/README.rst b/README.rst index 97b21898e..97ab784cd 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 @@ -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 diff --git a/changelog/3902.doc.rst b/changelog/3902.doc.rst new file mode 100644 index 000000000..8e1472c8c --- /dev/null +++ b/changelog/3902.doc.rst @@ -0,0 +1 @@ +Fix pytest.org links 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. diff --git a/scripts/release.minor.rst b/scripts/release.minor.rst index bdd8282cf..9a488edbc 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://docs.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..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 http://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: 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", 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 ", ) 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", ) 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": 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 ", ) 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*", ] )