Remove the relaxed requirements (#2353)

* rm relaxed requirements

* rm base constraints file

* update requirements input file

* sync requirements lock file

* update noxfile to rm relaxed reqs

* update pip-compile workflow to rm relaxed reqs

* update docs

* fix noxfile issues

* tidy up pins and reqs

* Update tests/constraints.in

Co-authored-by: Felix Fontein <[email protected]>

* add all version ranges to constraints

* Update tests/requirements.in

Co-authored-by: Felix Fontein <[email protected]>

* Update tests/constraints.in

Co-authored-by: Felix Fontein <[email protected]>

* sync req lock file

---------

Co-authored-by: Felix Fontein <[email protected]>

Author: oraNod

.github/workflows/pip-compile-docs.yml

@@ -30,7 +30,6 @@ jobs:
       nox-args: >-
         -e
         'pip-compile(requirements)'
-        'pip-compile(requirements-relaxed)'
       reset-branch: "${{ inputs.reset-branch || false }}"
       labels: "${{ inputs.labels || 'doc builds,no_backport' }}"
       python-versions: "3.11"

docs/docsite/rst/community/documentation_contributions.rst

@@ -113,7 +113,6 @@ For more information on minimum Python versions, see the :ref:`support matrix <s
 
     pip install -r tests/requirements.in -c tests/requirements.txt # Installs tested dependency versions.
     pip install -r tests/requirements.in # Installs the unpinned dependency versions.
-    pip install -r tests/requirements-relaxed.in # Installs the unpinned dependency versions including untested antsibull-docs.
 
 
 .. note::

noxfile.py

@@ -3,7 +3,6 @@
 import os
 import shlex
 import shutil
-from argparse import ArgumentParser, BooleanOptionalAction
 from contextlib import suppress
 from glob import iglob
 from pathlib import Path
@@ -225,20 +224,6 @@ def _clone_core_check(session: nox.Session) -> None:
     session.run("python", "docs/bin/clone-core.py", "--check")
 
 
-def _relaxed_parser(session: nox.Session) -> ArgumentParser:
-    """
-    Generate an argument parser with a --relaxed option.
-    """
-    parser = ArgumentParser(prog=f"nox -e {session.name} --")
-    parser.add_argument(
-        "--relaxed",
-        default=False,
-        action=BooleanOptionalAction,
-        help="Whether to use requirements-relaxed file. (Default: %(default)s)",
-    )
-    return parser
-
-
 def _env_python(session: nox.Session) -> str:
     """
     Get the full path to an environment's python executable
@@ -256,9 +241,8 @@ def checkers(session: nox.Session, test: str):
     """
     Run docs build checkers
     """
-    args = _relaxed_parser(session).parse_args(session.posargs)
 
-    install(session, req="requirements-relaxed" if args.relaxed else "requirements")
+    install(session, req="requirements")
     _clone_core_check(session)
     session.run("make", "-C", "docs/docsite", "clean", external=True)
     session.run("python", "tests/checkers.py", test)
@@ -269,19 +253,18 @@ def make(session: nox.Session):
     """
     Generate HTML from documentation source using the Makefile
     """
-    parser = _relaxed_parser(session)
-    parser.add_argument(
-        "make_args", nargs="*", help="Specify make targets as arguments"
-    )
-    args = parser.parse_args(session.posargs)
+    make_args = session.posargs or ["clean", "coredocs"]
 
-    install(session, req="requirements-relaxed" if args.relaxed else "requirements")
+    install(session, req="requirements")
     _clone_core_check(session)
-    make_args: list[str] = [
+    session.run(
+        "make",
+        "-C",
+        "docs/docsite",
         f"PYTHON={_env_python(session)}",
-        *(args.make_args or ("clean", "coredocs")),
-    ]
-    session.run("make", "-C", "docs/docsite", *make_args, external=True)
+        *make_args,
+        external=True,
+    )
 
 
 @nox.session

tests/constraints-base.in

@@ -1,5 +1,12 @@
 # This constraints file contains pins for the stable, tested versions of sphinx
 # and antsibull-docs that production builds rely upon.
+# This constraint file also pins other versions for which there are known limitations.
 
 sphinx == 7.2.5
 antsibull-docs == 2.16.2  # currently approved version
+
+sphinx-rtd-theme >= 2.0.0  # Fix 404 pages with new sphinx -- https://github.com/ansible/ansible-documentation/issues/678
+rstcheck < 6  # rstcheck 6.x has problem with rstcheck.core triggered by include files w/ sphinx directives https://github.com/rstcheck/rstcheck-core/issues/3
+jinja2 >= 3.0.0  # https://github.com/ansible/ansible/blob/devel/requirements.txt
+pyyaml >= 5.1  # https://github.com/ansible/ansible/blob/devel/requirements.txt
+resolvelib >= 0.5.3, < 1.1.0  # https://github.com/ansible/ansible/blob/devel/requirements.txt

tests/constraints.in

@@ -1,5 +1,19 @@
-# This requirements file is used for stable ansible docs builds
-# It depends on specific, tested antsibull-docs and sphinx versions
+# This requirements file is used for doc builds
 
 -c constraints.in # <-- contains known limitations
--r requirements-relaxed.in # <-- contains base set of dependencies
+
+# Base set of dependencies.
+
+antsibull-docs
+sphinx
+sphinx-intl # translation utility used by docs/docsite/Makefile
+sphinx-notfound-page # extension used for the custom 404 page (cowsay)
+sphinx-ansible-theme # extension used for the custom docs theme
+sphinx-rtd-theme
+rstcheck
+sphinx-copybutton
+jinja2 # used by hacking/build_library/build_ansible/command_plugins/generate_man.py and dump_keywords.py
+pyyaml # used by ansible-core
+resolvelib # used by ansible-core
+cryptography # used by ansible-core
+packaging # used by ansible-core