diff --git a/docs/rolereference.rst b/docs/rolereference.rst index 905aa79538185a0b5111afdb89fcc2395f994de4..a9327a6f3ca810908e1d411ad884de32f3f3b64e 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -1746,10 +1746,7 @@ The role implements the following: * Adds website administrator to website's group, so administrator could manage the code and data. * Installs additional packages required for running the role (as configured). -* Sets-up a dedicated Python virtual environment for website. Python - version can be specified (default is Python 2). -* Install ``futures`` package in Python virtual environment (required for - Gunicorn in combination with Python 2.7). +* Sets-up a dedicated Python virtual environment for website. * Install Gunicorn in Python virtual environment. * Installs additional packages required for running the role in Python virtual environment (as configured). @@ -1919,13 +1916,11 @@ Parameters noted that in either case the value should be specsified relative to the ``code`` sub-directory. I.e. don't use full paths. -**wsgi_requirements** (list, optional, ``[ futures==3.3.0, gunicorn==19.10.0 ]``) +**wsgi_requirements** (list, optional, ``[ gunicorn==21.2.0, packaging==23.2 ]``) Complete list of pip requirements used for deploying Gunicorn. If specified, this list will be used to create requirements file and install Gunicorn and its dependencies from that one. This allows to - have pinned packages for both Gunicorn, futures, and their - dependencies. The ``futures`` package is required by Gunicorn when - using Python 2.7. + have pinned packages for both Gunicorn and its dependencies. It should be noted that this installation method is meant primarily in case of roles that want to take advantage of upgrade checks for pip requirements @@ -1935,10 +1930,9 @@ Parameters specified the role will deploy necessary files for running the pip requirements upgrade check (see the ``common`` role for description). For this a directory is created under - ``/etc/pip_check_requirements_upgrades/FQDN`` for Python 2 or - ``/etc/pip_check_requirements_upgrades-py3/FQDN`` for Python 3. The same - directory should be used by dependant roles to deploy their own - ``.in`` and ``.txt`` files. Make sure the file ownership is set to + ``/etc/pip_check_requirements_upgrades/FQDN``. The same directory + should be used by dependant roles to deploy their own ``.in`` and + ``.txt`` files. Make sure the file ownership is set to ``root:pipreqcheck``. Should you need to utilise the requirements file in some manner (other than @@ -1950,12 +1944,10 @@ Parameters `_ (the ``pip-compile`` utility) with ``gunicorn`` and ``futures`` in the ``.in.`` file. -**wsgi_requirements_in** (list, optional, ``[ futures, gunicorn ]``) +**wsgi_requirements_in** (list, optional, ``[ gunicorn ]``) List of top level packages to use when performing the pip requirements upgrade checks for the Gunicorn requirements (listed - via ``wsgi_requirements`` parameter). For Python 3-based websites, - it should be sufficient to list only ``gunicorn`` (``futures`` is - required for Python 2). + via ``wsgi_requirements`` parameter). Distribution compatibility