diff --git a/VERSION b/VERSION index e176f520809fc0bc0051684a2c83a39fb556960e..e373cc4726352f98e0eb6778c8d820464aaf4cae 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.97 +4.0.98 diff --git a/docs/source/installation/index.rst b/docs/source/installation/index.rst index b89b88c2e60155565884107cbe25530f7fd0ce74..bba8af71d4ea7be39649e06f97936a7548390e79 100644 --- a/docs/source/installation/index.rst +++ b/docs/source/installation/index.rst @@ -174,9 +174,13 @@ There are two methods of configuring the Autosubmit main paths. * ``autosubmit configure`` is suited for a personal/single user who wants to test Autosubmit in the scope of ``$HOME``. It will generate an ``$HOME/.autosubmitrc`` file that overrides the machine configuration. -* Manually generate an ``autosubmitrc`` file in ``/etc/autosubmitrc``, suited for a workgroup or production environment that wants to use Autosubmit in a shared database in a manner that multiple users can share and view others' experiments. +Manually generate an ``autosubmitrc`` file in one of these locations, which is the recommended method for a production environment with a shared database in a manner that multiple users can share and view others' experiments. -.. important:: `.autosubmitrc` user level and user level precedes system configuration. `$HOME/.autosubmitrc > /etc/autosubmitrc` +* ``/etc/autosubmitrc``, System level configuration. + +* Set the environment variable ``AUTOSUBMIT_CONFIGURATION`` to the path of the ``autosubmitrc`` file. This will override all other configuration files. + +.. important:: `.autosubmitrc` user level precedes system configuration unless the environment variable is set. `AUTOSUBMIT_CONFIGURATION` > `$HOME/.autosubmitrc > /etc/autosubmitrc` Quick Installation - Non-shared database (user level) ------------------------------------------------------ diff --git a/requeriments.txt b/requeriments.txt index cd93f47c5d404fa8003393604e028dde636f6515..15acaad8cac480235cdc56bde2642f449dc38e1c 100644 --- a/requeriments.txt +++ b/requeriments.txt @@ -1,6 +1,6 @@ setuptools>=60.8.2 cython -autosubmitconfigparser==1.0.48 +autosubmitconfigparser==1.0.49 paramiko>=2.9.2 bcrypt>=3.2 PyNaCl>=1.5.0