diff options
Diffstat (limited to '')
54 files changed, 465 insertions, 69 deletions
diff --git a/tests/roots/test-changes/base.rst b/tests/roots/test-changes/base.rst index a1b2839..81d90e6 100644 --- a/tests/roots/test-changes/base.rst +++ b/tests/roots/test-changes/base.rst @@ -10,6 +10,9 @@ Version markup .. deprecated:: 0.6 Boring stuff. +.. versionremoved:: 0.6 + Goodbye boring stuff. + .. versionadded:: 1.2 First paragraph of versionadded. diff --git a/tests/roots/test-changes/conf.py b/tests/roots/test-changes/conf.py index c3b2169..29bea6a 100644 --- a/tests/roots/test-changes/conf.py +++ b/tests/roots/test-changes/conf.py @@ -1,4 +1,4 @@ project = 'Sphinx ChangesBuilder tests' -copyright = '2007-2023 by the Sphinx team, see AUTHORS' +copyright = '2007-2024 by the Sphinx team, see AUTHORS' version = '0.6' release = '0.6alpha1' diff --git a/tests/roots/test-domain-cpp/operator-lookup.rst b/tests/roots/test-domain-cpp/operator-lookup.rst new file mode 100644 index 0000000..671b91b --- /dev/null +++ b/tests/roots/test-domain-cpp/operator-lookup.rst @@ -0,0 +1,28 @@ +When doing name resolution there are 4 different idenOrOps: + +- identifier +- built-in operator +- user-defined literal +- type conversion + +.. cpp:function:: int g() +.. cpp:function:: int operator+(int, int) +.. cpp:function:: int operator""_lit() + +.. cpp:class:: B + + .. cpp:function:: operator int() + + Functions that can't be found: + + - :cpp:func:`int h()` + - :cpp:func:`int operator+(bool, bool)` + - :cpp:func:`int operator""_udl()` + - :cpp:func:`operator bool()` + + Functions that should be found: + + - :cpp:func:`int g()` + - :cpp:func:`int operator+(int, int)` + - :cpp:func:`int operator""_lit()` + - :cpp:func:`operator int()` diff --git a/tests/roots/test-domain-py/module.rst b/tests/roots/test-domain-py/module.rst index 4a28068..70098f6 100644 --- a/tests/roots/test-domain-py/module.rst +++ b/tests/roots/test-domain-py/module.rst @@ -58,3 +58,9 @@ module .. py:module:: object .. py:function:: sum() + +.. py:data:: test + :type: typing.Literal[2] + +.. py:data:: test2 + :type: typing.Literal[-2] diff --git a/tests/roots/test-ext-autodoc/target/enums.py b/tests/roots/test-ext-autodoc/target/enums.py index c69455f..6b27316 100644 --- a/tests/roots/test-ext-autodoc/target/enums.py +++ b/tests/roots/test-ext-autodoc/target/enums.py @@ -1,10 +1,46 @@ +# ruff: NoQA: D403, PIE796 import enum +from typing import final + + +class MemberType: + """Custom data type with a simple API.""" + + # this mangled attribute will never be shown on subclasses + # even if :inherited-members: and :private-members: are set + __slots__ = ('__data',) + + def __new__(cls, value): + self = object.__new__(cls) + self.__data = value + return self + + def __str__(self): + """inherited""" + return self.__data + + def __repr__(self): + return repr(self.__data) + + def __reduce__(self): + # data types must be pickable, otherwise enum classes using this data + # type will be forced to be non-pickable and have their __module__ set + # to '<unknown>' instead of, for instance, '__main__' + return self.__class__, (self.__data,) + + @final + @property + def dtype(self): + """docstring""" + return 'str' + + def isupper(self): + """inherited""" + return self.__data.isupper() class EnumCls(enum.Enum): - """ - this is enum class - """ + """this is enum class""" #: doc for val1 val1 = 12 @@ -15,9 +51,194 @@ class EnumCls(enum.Enum): def say_hello(self): """a method says hello to you.""" - pass @classmethod def say_goodbye(cls): """a classmethod says good-bye to you.""" - pass + + +class EnumClassWithDataType(MemberType, enum.Enum): + """this is enum class""" + + x = 'x' + + def say_hello(self): + """docstring""" + + @classmethod + def say_goodbye(cls): + """docstring""" + + +class ToUpperCase: # not inheriting from enum.Enum + @property + def value(self): # bypass enum.Enum.value + """uppercased""" + return str(self._value_).upper() # type: ignore[attr-defined] + + +class Greeter: + def say_hello(self): + """inherited""" + + @classmethod + def say_goodbye(cls): + """inherited""" + + +class EnumClassWithMixinType(ToUpperCase, enum.Enum): + """this is enum class""" + + x = 'x' + + def say_hello(self): + """docstring""" + + @classmethod + def say_goodbye(cls): + """docstring""" + + +class EnumClassWithMixinTypeInherit(Greeter, ToUpperCase, enum.Enum): + """this is enum class""" + + x = 'x' + + +class Overridden(enum.Enum): + def override(self): + """inherited""" + return 1 + + +class EnumClassWithMixinEnumType(Greeter, Overridden, enum.Enum): + """this is enum class""" + + x = 'x' + + def override(self): + """overridden""" + return 2 + + +class EnumClassWithMixinAndDataType(Greeter, ToUpperCase, MemberType, enum.Enum): + """this is enum class""" + + x = 'x' + + def say_hello(self): + """overridden""" + + @classmethod + def say_goodbye(cls): + """overridden""" + + def isupper(self): + """overridden""" + return False + + def __str__(self): + """overridden""" + return super().__str__() + + +class _ParentEnum(Greeter, Overridden, enum.Enum): + """docstring""" + + +class EnumClassWithParentEnum(ToUpperCase, MemberType, _ParentEnum, enum.Enum): + """this is enum class""" + + x = 'x' + + def isupper(self): + """overridden""" + return False + + def __str__(self): + """overridden""" + return super().__str__() + + +class _SunderMissingInNonEnumMixin: + @classmethod + def _missing_(cls, value): + """inherited""" + return super()._missing_(value) # type: ignore[misc] + + +class _SunderMissingInEnumMixin(enum.Enum): + @classmethod + def _missing_(cls, value): + """inherited""" + return super()._missing_(value) + + +class _SunderMissingInDataType(MemberType): + @classmethod + def _missing_(cls, value): + """inherited""" + return super()._missing_(value) # type: ignore[misc] + + +class EnumSunderMissingInNonEnumMixin(_SunderMissingInNonEnumMixin, enum.Enum): + """this is enum class""" + + +class EnumSunderMissingInEnumMixin(_SunderMissingInEnumMixin, enum.Enum): + """this is enum class""" + + +class EnumSunderMissingInDataType(_SunderMissingInDataType, enum.Enum): + """this is enum class""" + + +class EnumSunderMissingInClass(enum.Enum): + """this is enum class""" + + @classmethod + def _missing_(cls, value): + """docstring""" + return super()._missing_(value) + + +class _NamePropertyInNonEnumMixin: + @property + def name(self): + """inherited""" + return super().name # type: ignore[misc] + + +class _NamePropertyInEnumMixin(enum.Enum): + @property + def name(self): + """inherited""" + return super().name + + +class _NamePropertyInDataType(MemberType): + @property + def name(self): + """inherited""" + return super().name # type: ignore[misc] + + +class EnumNamePropertyInNonEnumMixin(_NamePropertyInNonEnumMixin, enum.Enum): + """this is enum class""" + + +class EnumNamePropertyInEnumMixin(_NamePropertyInEnumMixin, enum.Enum): + """this is enum class""" + + +class EnumNamePropertyInDataType(_NamePropertyInDataType, enum.Enum): + """this is enum class""" + + +class EnumNamePropertyInClass(enum.Enum): + """this is enum class""" + + @property + def name(self): + """docstring""" + return super().name diff --git a/tests/roots/test-ext-autodoc/target/functions.py b/tests/roots/test-ext-autodoc/target/functions.py index b62aa70..0265fb3 100644 --- a/tests/roots/test-ext-autodoc/target/functions.py +++ b/tests/roots/test-ext-autodoc/target/functions.py @@ -17,3 +17,6 @@ partial_coroutinefunc = partial(coroutinefunc) builtin_func = print partial_builtin_func = partial(print) + +def slice_arg_func(arg: 'float64[:, :]'): + pass diff --git a/tests/roots/test-ext-autodoc/target/inherited_annotations.py b/tests/roots/test-ext-autodoc/target/inherited_annotations.py new file mode 100644 index 0000000..3ae58a8 --- /dev/null +++ b/tests/roots/test-ext-autodoc/target/inherited_annotations.py @@ -0,0 +1,17 @@ +""" + Test case for #11387 corner case involving inherited + members with type annotations on python 3.9 and earlier +""" + +class HasTypeAnnotatedMember: + inherit_me: int + """Inherited""" + +class NoTypeAnnotation(HasTypeAnnotatedMember): + a = 1 + """Local""" + +class NoTypeAnnotation2(HasTypeAnnotatedMember): + a = 1 + """Local""" + diff --git a/tests/roots/test-ext-autodoc/target/singledispatchmethod_classmethod.py b/tests/roots/test-ext-autodoc/target/singledispatchmethod_classmethod.py new file mode 100644 index 0000000..039fada --- /dev/null +++ b/tests/roots/test-ext-autodoc/target/singledispatchmethod_classmethod.py @@ -0,0 +1,31 @@ +from functools import singledispatchmethod + + +class Foo: + """docstring""" + + @singledispatchmethod + @classmethod + def class_meth(cls, arg, kwarg=None): + """A class method for general use.""" + pass + + @class_meth.register(int) + @class_meth.register(float) + @classmethod + def _class_meth_int(cls, arg, kwarg=None): + """A class method for numbers.""" + pass + + @class_meth.register(str) + @classmethod + def _class_meth_str(cls, arg, kwarg=None): + """A class method for str.""" + pass + + @class_meth.register + @classmethod + def _class_meth_dict(cls, arg: dict, kwarg=None): + """A class method for dict.""" + # This function tests for specifying type through annotations + pass diff --git a/tests/roots/test-ext-doctest-skipif/conf.py b/tests/roots/test-ext-doctest-skipif/conf.py index 6f54982..cd8f3eb 100644 --- a/tests/roots/test-ext-doctest-skipif/conf.py +++ b/tests/roots/test-ext-doctest-skipif/conf.py @@ -6,7 +6,7 @@ source_suffix = '.txt' exclude_patterns = ['_build'] doctest_global_setup = ''' -from tests.test_ext_doctest import record +from tests.test_extensions.test_ext_doctest import record record('doctest_global_setup', 'body', True) ''' diff --git a/tests/roots/test-ext-doctest/doctest.txt b/tests/roots/test-ext-doctest/doctest.txt index 04780cf..0adcf74 100644 --- a/tests/roots/test-ext-doctest/doctest.txt +++ b/tests/roots/test-ext-doctest/doctest.txt @@ -139,7 +139,7 @@ Special directives .. testcleanup:: * - from tests import test_ext_doctest + from tests.test_extensions import test_ext_doctest test_ext_doctest.cleanup_call() non-ASCII result diff --git a/tests/roots/test-ext-imgmockconverter/mocksvgconverter.py b/tests/roots/test-ext-imgmockconverter/mocksvgconverter.py index 43368de..c092860 100644 --- a/tests/roots/test-ext-imgmockconverter/mocksvgconverter.py +++ b/tests/roots/test-ext-imgmockconverter/mocksvgconverter.py @@ -8,9 +8,9 @@ from sphinx.transforms.post_transforms.images import ImageConverter if False: # For type annotation - from typing import Any, Dict # NOQA + from typing import Any, Dict # NoQA - from sphinx.application import Sphinx # NOQA + from sphinx.application import Sphinx # NoQA class MyConverter(ImageConverter): conversion_rules = [ diff --git a/tests/roots/test-ext-intersphinx-role/index.rst b/tests/roots/test-ext-intersphinx-role/index.rst index 58edb7a..63bccf0 100644 --- a/tests/roots/test-ext-intersphinx-role/index.rst +++ b/tests/roots/test-ext-intersphinx-role/index.rst @@ -39,6 +39,10 @@ - a class with explicit non-existing inventory, which also has upper-case in name: :external+invNope:cpp:class:`foo::Bar` +- An object type being mistakenly used instead of a role name: + + - :external+inv:c:function:`CFunc` + - :external+inv:function:`CFunc` - explicit title: :external:cpp:type:`FoonsTitle <foons>` diff --git a/tests/roots/test-ext-math-include/conf.py b/tests/roots/test-ext-math-include/conf.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/roots/test-ext-math-include/conf.py diff --git a/tests/roots/test-ext-math-include/included.rst b/tests/roots/test-ext-math-include/included.rst new file mode 100644 index 0000000..7fb746e --- /dev/null +++ b/tests/roots/test-ext-math-include/included.rst @@ -0,0 +1,6 @@ +Title +===== + +Some file including some maths. + +.. include:: math.rst
\ No newline at end of file diff --git a/tests/roots/test-ext-math-include/index.rst b/tests/roots/test-ext-math-include/index.rst new file mode 100644 index 0000000..cc95338 --- /dev/null +++ b/tests/roots/test-ext-math-include/index.rst @@ -0,0 +1,7 @@ +Test Math +========= + +.. toctree:: + :numbered: 1 + + included diff --git a/tests/roots/test-ext-math-include/math.rst b/tests/roots/test-ext-math-include/math.rst new file mode 100644 index 0000000..a4266d0 --- /dev/null +++ b/tests/roots/test-ext-math-include/math.rst @@ -0,0 +1,4 @@ +:math:`1 + 1 = 2` +================= + +Lorem ipsum.
\ No newline at end of file diff --git a/tests/roots/test-ext-napoleon-paramtype/conf.py b/tests/roots/test-ext-napoleon-paramtype/conf.py new file mode 100644 index 0000000..34e2274 --- /dev/null +++ b/tests/roots/test-ext-napoleon-paramtype/conf.py @@ -0,0 +1,15 @@ +import os +import sys + +sys.path.insert(0, os.path.abspath('.')) +extensions = [ + 'sphinx.ext.autodoc', + 'sphinx.ext.napoleon', + 'sphinx.ext.intersphinx' +] + +# Python inventory is manually created in the test +# in order to avoid creating a real HTTP connection +intersphinx_mapping = {} +intersphinx_cache_limit = 0 +intersphinx_disabled_reftypes = []
\ No newline at end of file diff --git a/tests/roots/test-ext-napoleon-paramtype/index.rst b/tests/roots/test-ext-napoleon-paramtype/index.rst new file mode 100644 index 0000000..5540897 --- /dev/null +++ b/tests/roots/test-ext-napoleon-paramtype/index.rst @@ -0,0 +1,8 @@ +test-ext-napoleon +================= + +.. automodule:: pkg.bar + :members: + +.. automodule:: pkg.foo + :members: diff --git a/tests/roots/test-ext-napoleon-paramtype/pkg/__init__.py b/tests/roots/test-ext-napoleon-paramtype/pkg/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/roots/test-ext-napoleon-paramtype/pkg/__init__.py diff --git a/tests/roots/test-ext-napoleon-paramtype/pkg/bar.py b/tests/roots/test-ext-napoleon-paramtype/pkg/bar.py new file mode 100644 index 0000000..e1ae794 --- /dev/null +++ b/tests/roots/test-ext-napoleon-paramtype/pkg/bar.py @@ -0,0 +1,10 @@ +class Bar: + """The bar.""" + def list(self) -> None: + """A list method.""" + + @staticmethod + def int() -> float: + """An int method.""" + return 1.0 + diff --git a/tests/roots/test-ext-napoleon-paramtype/pkg/foo.py b/tests/roots/test-ext-napoleon-paramtype/pkg/foo.py new file mode 100644 index 0000000..6979f9e --- /dev/null +++ b/tests/roots/test-ext-napoleon-paramtype/pkg/foo.py @@ -0,0 +1,27 @@ +class Foo: + """The foo.""" + def do( + self, + *, + keyword_paramtype, + keyword_kwtype, + kwarg_paramtype, + kwarg_kwtype, + kwparam_paramtype, + kwparam_kwtype, + ): + """Some method. + + :keyword keyword_paramtype: some param + :paramtype keyword_paramtype: list[int] + :keyword keyword_kwtype: some param + :kwtype keyword_kwtype: list[int] + :kwarg kwarg_paramtype: some param + :paramtype kwarg_paramtype: list[int] + :kwarg kwarg_kwtype: some param + :kwtype kwarg_kwtype: list[int] + :kwparam kwparam_paramtype: some param + :paramtype kwparam_paramtype: list[int] + :kwparam kwparam_kwtype: some param + :kwtype kwparam_kwtype: list[int] + """ diff --git a/tests/roots/test-ext-viewcode/conf.py b/tests/roots/test-ext-viewcode/conf.py index 5e07214..d6de1d9 100644 --- a/tests/roots/test-ext-viewcode/conf.py +++ b/tests/roots/test-ext-viewcode/conf.py @@ -15,10 +15,10 @@ if 'test_linkcode' in tags: def linkcode_resolve(domain, info): if domain == 'py': fn = info['module'].replace('.', '/') - return "http://foobar/source/%s.py" % fn + return "https://foobar/source/%s.py" % fn elif domain == "js": - return "http://foobar/js/" + info['fullname'] + return "https://foobar/js/" + info['fullname'] elif domain in ("c", "cpp"): - return f"http://foobar/{domain}/{''.join(info['names'])}" + return f"https://foobar/{domain}/{''.join(info['names'])}" else: raise AssertionError() diff --git a/tests/roots/test-footnotes/index.rst b/tests/roots/test-footnotes/index.rst index f2c5d0e..e4490ed 100644 --- a/tests/roots/test-footnotes/index.rst +++ b/tests/roots/test-footnotes/index.rst @@ -31,10 +31,10 @@ The section with a reference to [AuthorYear]_ * First footnote: [#]_ * Second footnote: [1]_ -* `Sphinx <http://sphinx-doc.org/>`_ +* `Sphinx <https://sphinx-doc.org/>`_ * Third footnote: [#]_ * Fourth footnote: [#named]_ -* `URL including tilde <http://sphinx-doc.org/~test/>`_ +* `URL including tilde <https://sphinx-doc.org/~test/>`_ * GitHub Page: `https://github.com/sphinx-doc/sphinx <https://github.com/sphinx-doc/sphinx>`_ * Mailing list: `sphinx-dev@googlegroups.com <mailto:sphinx-dev@googlegroups.com>`_ @@ -49,13 +49,13 @@ The section with a reference to [#]_ .. [#] Footnote in section -`URL in term <http://sphinx-doc.org/>`_ +`URL in term <https://sphinx-doc.org/>`_ Description Description Description ... Footnote in term [#]_ Description Description Description ... - `Term in deflist <http://sphinx-doc.org/>`_ + `Term in deflist <https://sphinx-doc.org/>`_ Description2 .. [#] Footnote in term diff --git a/tests/roots/test-images/index.rst b/tests/roots/test-images/index.rst index 14a2987..9b9aac1 100644 --- a/tests/roots/test-images/index.rst +++ b/tests/roots/test-images/index.rst @@ -23,7 +23,7 @@ test-image :target: https://www.python.org/ .. a remote image -.. image:: https://www.python.org/static/img/python-logo.png +.. image:: http://localhost:7777/sphinx.png .. non-exist remote image -.. image:: https://www.google.com/NOT_EXIST.PNG +.. image:: http://localhost:7777/NOT_EXIST.PNG diff --git a/tests/roots/test-intl/definition_terms.txt b/tests/roots/test-intl/definition_terms.txt index 4c56288..19d4fcb 100644 --- a/tests/roots/test-intl/definition_terms.txt +++ b/tests/roots/test-intl/definition_terms.txt @@ -6,7 +6,7 @@ i18n with definition terms Some term The corresponding definition -Some *term* `with link <http://sphinx-doc.org/>`__ +Some *term* `with link <https://sphinx-doc.org/>`__ The corresponding definition #2 Some **term** with : classifier1 : classifier2 diff --git a/tests/roots/test-intl/external_links.txt b/tests/roots/test-intl/external_links.txt index 1cecbee..2d0c063 100644 --- a/tests/roots/test-intl/external_links.txt +++ b/tests/roots/test-intl/external_links.txt @@ -8,12 +8,12 @@ External link to Python_. Internal link to `i18n with external links`_. -Inline link by `Sphinx Site <http://sphinx-doc.org>`_. +Inline link by `Sphinx Site <https://sphinx-doc.org>`_. Unnamed link__. -.. _Python: http://python.org/index.html -.. __: http://google.com +.. _Python: https://python.org/index.html +.. __: https://google.com link target swapped translation @@ -21,7 +21,7 @@ link target swapped translation link to external1_ and external2_. -link to `Sphinx Site <http://sphinx-doc.org>`_ and `Python Site <http://python.org>`_. +link to `Sphinx Site <https://sphinx-doc.org>`_ and `Python Site <https://python.org>`_. .. _external1: https://www.google.com/external1 .. _external2: https://www.google.com/external2 @@ -30,6 +30,6 @@ link to `Sphinx Site <http://sphinx-doc.org>`_ and `Python Site <http://python.o Multiple references in the same line ===================================== -Link to `Sphinx Site <http://sphinx-doc.org>`_, `Python Site <http://python.org>`_, Python_, Unnamed__ and `i18n with external links`_. +Link to `Sphinx Site <https://sphinx-doc.org>`_, `Python Site <https://python.org>`_, Python_, Unnamed__ and `i18n with external links`_. -.. __: http://google.com +.. __: https://google.com diff --git a/tests/roots/test-intl/raw.txt b/tests/roots/test-intl/raw.txt index fe77f6c..1825941 100644 --- a/tests/roots/test-intl/raw.txt +++ b/tests/roots/test-intl/raw.txt @@ -4,5 +4,5 @@ Raw .. raw:: html - <iframe src="http://sphinx-doc.org"></iframe> + <iframe src="https://sphinx-doc.org"></iframe> diff --git a/tests/roots/test-intl/refs.txt b/tests/roots/test-intl/refs.txt index 4a094b2..ab52ef1 100644 --- a/tests/roots/test-intl/refs.txt +++ b/tests/roots/test-intl/refs.txt @@ -6,7 +6,7 @@ Translation Tips .. _download Sphinx: https://pypi.org/project/Sphinx/ .. _Docutils site: https://docutils.sourceforge.io/ -.. _Sphinx site: http://sphinx-doc.org/ +.. _Sphinx site: https://sphinx-doc.org/ A-1. Here's how you can `download Sphinx`_. diff --git a/tests/roots/test-intl/refs_inconsistency.txt b/tests/roots/test-intl/refs_inconsistency.txt index b16623a..4840597 100644 --- a/tests/roots/test-intl/refs_inconsistency.txt +++ b/tests/roots/test-intl/refs_inconsistency.txt @@ -10,4 +10,4 @@ i18n with refs inconsistency .. [#] This is a auto numbered footnote. .. [ref2] This is a citation. .. [100] This is a numbered footnote. -.. _reference: http://www.example.com +.. _reference: https://www.example.com diff --git a/tests/roots/test-intl/versionchange.txt b/tests/roots/test-intl/versionchange.txt index 4c57e14..7645342 100644 --- a/tests/roots/test-intl/versionchange.txt +++ b/tests/roots/test-intl/versionchange.txt @@ -14,3 +14,5 @@ i18n with versionchange .. versionchanged:: 1.0 This is the *first* paragraph of versionchanged. + +.. versionremoved:: 1.0 This is the *first* paragraph of versionremoved. diff --git a/tests/roots/test-intl/xx/LC_MESSAGES/definition_terms.po b/tests/roots/test-intl/xx/LC_MESSAGES/definition_terms.po index 1752dd6..a19c9d1 100644 --- a/tests/roots/test-intl/xx/LC_MESSAGES/definition_terms.po +++ b/tests/roots/test-intl/xx/LC_MESSAGES/definition_terms.po @@ -25,8 +25,8 @@ msgstr "SOME TERM" msgid "The corresponding definition"
msgstr "THE CORRESPONDING DEFINITION"
-msgid "Some *term* `with link <http://sphinx-doc.org/>`__"
-msgstr "SOME *TERM* `WITH LINK <http://sphinx-doc.org/>`__"
+msgid "Some *term* `with link <https://sphinx-doc.org/>`__"
+msgstr "SOME *TERM* `WITH LINK <https://sphinx-doc.org/>`__"
msgid "The corresponding definition #2"
msgstr "THE CORRESPONDING DEFINITION #2"
diff --git a/tests/roots/test-intl/xx/LC_MESSAGES/external_links.po b/tests/roots/test-intl/xx/LC_MESSAGES/external_links.po index 8c53abb..345dc95 100644 --- a/tests/roots/test-intl/xx/LC_MESSAGES/external_links.po +++ b/tests/roots/test-intl/xx/LC_MESSAGES/external_links.po @@ -25,8 +25,8 @@ msgstr "EXTERNAL LINK TO Python_." msgid "Internal link to `i18n with external links`_." msgstr "`EXTERNAL LINKS`_ IS INTERNAL LINK." -msgid "Inline link by `Sphinx Site <http://sphinx-doc.org>`_." -msgstr "INLINE LINK BY `THE SPHINX SITE <http://sphinx-doc.org>`_." +msgid "Inline link by `Sphinx Site <https://sphinx-doc.org>`_." +msgstr "INLINE LINK BY `THE SPHINX SITE <https://sphinx-doc.org>`_." msgid "Unnamed link__." msgstr "UNNAMED LINK__." @@ -37,11 +37,11 @@ msgstr "LINK TARGET SWAPPED TRANSLATION" msgid "link to external1_ and external2_." msgstr "LINK TO external2_ AND external1_." -msgid "link to `Sphinx Site <http://sphinx-doc.org>`_ and `Python Site <http://python.org>`_." -msgstr "LINK TO `THE PYTHON SITE <http://python.org>`_ AND `THE SPHINX SITE <http://sphinx-doc.org>`_." +msgid "link to `Sphinx Site <https://sphinx-doc.org>`_ and `Python Site <https://python.org>`_." +msgstr "LINK TO `THE PYTHON SITE <https://python.org>`_ AND `THE SPHINX SITE <https://sphinx-doc.org>`_." msgid "Multiple references in the same line" msgstr "MULTIPLE REFERENCES IN THE SAME LINE" -msgid "Link to `Sphinx Site <http://sphinx-doc.org>`_, `Python Site <http://python.org>`_, Python_, Unnamed__ and `i18n with external links`_." -msgstr "LINK TO `EXTERNAL LINKS`_, Python_, `THE SPHINX SITE <http://sphinx-doc.org>`_, UNNAMED__ AND `THE PYTHON SITE <http://python.org>`_." +msgid "Link to `Sphinx Site <https://sphinx-doc.org>`_, `Python Site <https://python.org>`_, Python_, Unnamed__ and `i18n with external links`_." +msgstr "LINK TO `EXTERNAL LINKS`_, Python_, `THE SPHINX SITE <https://sphinx-doc.org>`_, UNNAMED__ AND `THE PYTHON SITE <https://python.org>`_." diff --git a/tests/roots/test-intl/xx/LC_MESSAGES/raw.po b/tests/roots/test-intl/xx/LC_MESSAGES/raw.po index f2e8893..303f46b 100644 --- a/tests/roots/test-intl/xx/LC_MESSAGES/raw.po +++ b/tests/roots/test-intl/xx/LC_MESSAGES/raw.po @@ -16,6 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -msgid "<iframe src=\"http://sphinx-doc.org\"></iframe>" -msgstr "<iframe src=\"HTTP://SPHINX-DOC.ORG\"></iframe>" +msgid "<iframe src=\"https://sphinx-doc.org\"></iframe>" +msgstr "<iframe src=\"HTTPS://SPHINX-DOC.ORG\"></iframe>" diff --git a/tests/roots/test-intl/xx/LC_MESSAGES/versionchange.po b/tests/roots/test-intl/xx/LC_MESSAGES/versionchange.po index 5a8df38..b1d7865 100644 --- a/tests/roots/test-intl/xx/LC_MESSAGES/versionchange.po +++ b/tests/roots/test-intl/xx/LC_MESSAGES/versionchange.po @@ -31,3 +31,5 @@ msgstr "THIS IS THE *FIRST* PARAGRAPH OF VERSIONADDED." msgid "This is the *first* paragraph of versionchanged." msgstr "THIS IS THE *FIRST* PARAGRAPH OF VERSIONCHANGED." +msgid "This is the *first* paragraph of versionremoved." +msgstr "THIS IS THE *FIRST* PARAGRAPH OF VERSIONREMOVED." diff --git a/tests/roots/test-linkcheck-anchors-ignore-for-url/conf.py b/tests/roots/test-linkcheck-anchors-ignore-for-url/conf.py index 0005bfa..3fc3628 100644 --- a/tests/roots/test-linkcheck-anchors-ignore-for-url/conf.py +++ b/tests/roots/test-linkcheck-anchors-ignore-for-url/conf.py @@ -1,3 +1,3 @@ exclude_patterns = ['_build'] linkcheck_anchors = True -linkcheck_timeout = 0.05 +linkcheck_timeout = 0.25 diff --git a/tests/roots/test-linkcheck-anchors-ignore/conf.py b/tests/roots/test-linkcheck-anchors-ignore/conf.py index 0005bfa..3fc3628 100644 --- a/tests/roots/test-linkcheck-anchors-ignore/conf.py +++ b/tests/roots/test-linkcheck-anchors-ignore/conf.py @@ -1,3 +1,3 @@ exclude_patterns = ['_build'] linkcheck_anchors = True -linkcheck_timeout = 0.05 +linkcheck_timeout = 0.25 diff --git a/tests/roots/test-linkcheck-documents_exclude/conf.py b/tests/roots/test-linkcheck-documents_exclude/conf.py index 52388f9..39fcdcb 100644 --- a/tests/roots/test-linkcheck-documents_exclude/conf.py +++ b/tests/roots/test-linkcheck-documents_exclude/conf.py @@ -3,4 +3,4 @@ linkcheck_exclude_documents = [ '^broken_link$', 'br[0-9]ken_link', ] -linkcheck_timeout = 0.05 +linkcheck_timeout = 0.25 diff --git a/tests/roots/test-linkcheck-localserver-anchor/conf.py b/tests/roots/test-linkcheck-localserver-anchor/conf.py index 0005bfa..3fc3628 100644 --- a/tests/roots/test-linkcheck-localserver-anchor/conf.py +++ b/tests/roots/test-linkcheck-localserver-anchor/conf.py @@ -1,3 +1,3 @@ exclude_patterns = ['_build'] linkcheck_anchors = True -linkcheck_timeout = 0.05 +linkcheck_timeout = 0.25 diff --git a/tests/roots/test-linkcheck-localserver-https/conf.py b/tests/roots/test-linkcheck-localserver-https/conf.py index a2ce01e..85cbe6f 100644 --- a/tests/roots/test-linkcheck-localserver-https/conf.py +++ b/tests/roots/test-linkcheck-localserver-https/conf.py @@ -1,2 +1,2 @@ exclude_patterns = ['_build'] -linkcheck_timeout = 0.05 +linkcheck_timeout = 0.25 diff --git a/tests/roots/test-linkcheck-localserver-warn-redirects/conf.py b/tests/roots/test-linkcheck-localserver-warn-redirects/conf.py index a2ce01e..85cbe6f 100644 --- a/tests/roots/test-linkcheck-localserver-warn-redirects/conf.py +++ b/tests/roots/test-linkcheck-localserver-warn-redirects/conf.py @@ -1,2 +1,2 @@ exclude_patterns = ['_build'] -linkcheck_timeout = 0.05 +linkcheck_timeout = 0.25 diff --git a/tests/roots/test-linkcheck-localserver/conf.py b/tests/roots/test-linkcheck-localserver/conf.py index a2ce01e..85cbe6f 100644 --- a/tests/roots/test-linkcheck-localserver/conf.py +++ b/tests/roots/test-linkcheck-localserver/conf.py @@ -1,2 +1,2 @@ exclude_patterns = ['_build'] -linkcheck_timeout = 0.05 +linkcheck_timeout = 0.25 diff --git a/tests/roots/test-linkcheck-raw-node/conf.py b/tests/roots/test-linkcheck-raw-node/conf.py index a2ce01e..85cbe6f 100644 --- a/tests/roots/test-linkcheck-raw-node/conf.py +++ b/tests/roots/test-linkcheck-raw-node/conf.py @@ -1,2 +1,2 @@ exclude_patterns = ['_build'] -linkcheck_timeout = 0.05 +linkcheck_timeout = 0.25 diff --git a/tests/roots/test-linkcheck-raw-node/index.rst b/tests/roots/test-linkcheck-raw-node/index.rst deleted file mode 100644 index 76e26b5..0000000 --- a/tests/roots/test-linkcheck-raw-node/index.rst +++ /dev/null @@ -1,2 +0,0 @@ -.. raw:: html - :url: http://localhost:7777/ diff --git a/tests/roots/test-linkcheck-too-many-retries/conf.py b/tests/roots/test-linkcheck-too-many-retries/conf.py index 0005bfa..3fc3628 100644 --- a/tests/roots/test-linkcheck-too-many-retries/conf.py +++ b/tests/roots/test-linkcheck-too-many-retries/conf.py @@ -1,3 +1,3 @@ exclude_patterns = ['_build'] linkcheck_anchors = True -linkcheck_timeout = 0.05 +linkcheck_timeout = 0.25 diff --git a/tests/roots/test-linkcheck/conf.py b/tests/roots/test-linkcheck/conf.py index 6ddb41a..7cb6a0d 100644 --- a/tests/roots/test-linkcheck/conf.py +++ b/tests/roots/test-linkcheck/conf.py @@ -1,4 +1,4 @@ root_doc = 'links' exclude_patterns = ['_build'] linkcheck_anchors = True -linkcheck_timeout = 0.05 +linkcheck_timeout = 0.25 diff --git a/tests/roots/test-manpage_url/index.rst b/tests/roots/test-manpage_url/index.rst index 50d3b04..6761f97 100644 --- a/tests/roots/test-manpage_url/index.rst +++ b/tests/roots/test-manpage_url/index.rst @@ -1,3 +1,7 @@ - * :manpage:`man(1)` - * :manpage:`ls.1` - * :manpage:`sphinx` +The :manpage:`cp(1)` +-------------------- +* :manpage:`man(1)` +* :manpage:`ls.1` +* :manpage:`sphinx` +* :manpage:`mailx(1) <bsd-mailx/mailx.1>` +* :manpage:`!man(1)` diff --git a/tests/roots/test-need-escaped/index.rst b/tests/roots/test-need-escaped/index.rst index 9ef74e0..29a24fa 100644 --- a/tests/roots/test-need-escaped/index.rst +++ b/tests/roots/test-need-escaped/index.rst @@ -15,7 +15,7 @@ Contents: foo bar - http://sphinx-doc.org/ + https://sphinx-doc.org/ baz qux diff --git a/tests/roots/test-roles-download/index.rst b/tests/roots/test-roles-download/index.rst index cdb075e..9d2c622 100644 --- a/tests/roots/test-roles-download/index.rst +++ b/tests/roots/test-roles-download/index.rst @@ -4,4 +4,4 @@ test-roles-download * :download:`dummy.dat` * :download:`another/dummy.dat` * :download:`not_found.dat` -* :download:`Sphinx logo <http://www.sphinx-doc.org/en/master/_static/sphinxheader.png>` +* :download:`Sphinx logo <https://www.sphinx-doc.org/en/master/_static/sphinx-logo.svg>` diff --git a/tests/roots/test-root/conf.py b/tests/roots/test-root/conf.py index 154d4d1..a14ffaf 100644 --- a/tests/roots/test-root/conf.py +++ b/tests/roots/test-root/conf.py @@ -114,8 +114,8 @@ latex_elements = { coverage_c_path = ['special/*.h'] coverage_c_regexes = {'function': r'^PyAPI_FUNC\(.*\)\s+([^_][\w_]+)'} -extlinks = {'issue': ('http://bugs.python.org/issue%s', 'issue %s'), - 'pyurl': ('http://python.org/%s', None)} +extlinks = {'issue': ('https://bugs.python.org/issue%s', 'issue %s'), + 'pyurl': ('https://python.org/%s', None)} # modify tags from conf.py tags.add('confpytag') diff --git a/tests/roots/test-root/images.txt b/tests/roots/test-root/images.txt index 1dc591a..5a096dc 100644 --- a/tests/roots/test-root/images.txt +++ b/tests/roots/test-root/images.txt @@ -12,9 +12,6 @@ Sphinx image handling .. an image with unspecified extension .. image:: img.* -.. a non-local image URI -.. image:: https://www.python.org/static/img/python-logo.png - .. an image with subdir and unspecified extension .. image:: subdir/simg.* diff --git a/tests/roots/test-root/index.txt b/tests/roots/test-root/index.txt index e39c958..6a37668 100644 --- a/tests/roots/test-root/index.txt +++ b/tests/roots/test-root/index.txt @@ -28,9 +28,9 @@ Contents: lists otherext - http://sphinx-doc.org/ - Latest reference <http://sphinx-doc.org/latest/> - Python <http://python.org/> + https://sphinx-doc.org/ + Latest reference <https://sphinx-doc.org/latest/> + Python <https://python.org/> Indices and tables ================== diff --git a/tests/roots/test-root/markup.txt b/tests/roots/test-root/markup.txt index b59a652..ff677eb 100644 --- a/tests/roots/test-root/markup.txt +++ b/tests/roots/test-root/markup.txt @@ -274,6 +274,9 @@ Version markup .. deprecated:: 0.6 Boring stuff. +.. versionremoved:: 0.6 + Goodbye boring stuff. + .. versionadded:: 1.2 First paragraph of versionadded. @@ -308,7 +311,7 @@ Reference lookup underscore: [Ref_1]_ .. seealso:: something, something else, something more - `Google <http://www.google.com>`_ + `Google <https://www.google.com>`_ For everything. .. hlist:: diff --git a/tests/roots/test-toctree/index.rst b/tests/roots/test-toctree/index.rst index adf1b84..d56f2f6 100644 --- a/tests/roots/test-toctree/index.rst +++ b/tests/roots/test-toctree/index.rst @@ -15,7 +15,7 @@ Contents: foo bar - http://sphinx-doc.org/ + https://sphinx-doc.org/ self .. only:: html @@ -44,8 +44,8 @@ This used to crash: .. toctree:: :hidden: - Latest reference <http://sphinx-doc.org/latest/> - Python <http://python.org/> + Latest reference <https://sphinx-doc.org/latest/> + Python <https://python.org/> Indices and tables ================== diff --git a/tests/roots/test-versioning/insert_beginning.txt b/tests/roots/test-versioning/insert_beginning.txt index 57102a7..9b6e723 100644 --- a/tests/roots/test-versioning/insert_beginning.txt +++ b/tests/roots/test-versioning/insert_beginning.txt @@ -1,7 +1,7 @@ Versioning test text ==================== -Apperantly inserting a paragraph at the beginning of a document caused +Apparently inserting a paragraph at the beginning of a document caused problems earlier so this document should be used to test that. So the thing is I need some kind of text - not the lorem ipsum stuff, that |