Merge pull request #5663 from fstagni/80_docs

[8.0] docs: removed a bunch of py2 related documentation

Author: fstagni

dirac.cfg

@@ -535,7 +535,7 @@ Systems
       {
         Port = 9190
         # This enables ES monitoring only for this particular service.
-        EnableActivityMonitoring = yes
+        EnableActivityMonitoring = no
         Authorization
         {
           Default = ServiceAdministrator
@@ -763,7 +763,7 @@ Operations
   Defaults
   {
     # This will globally enable ES based monitoring for Service and AgentModule.
-    EnableActivityMonitoring = yes
+    EnableActivityMonitoring = no
     DataManagement
     {
       # see http://dirac.readthedocs.io/en/latest/AdministratorGuide/Resources/Catalog/index.html#multi-protocol

docs/source/AdministratorGuide/ServerInstallations/InstallingDiracServer.rst

@@ -480,7 +480,7 @@ be taken based on the Python version you wish to install.
 
     or You can download the full server installation from::
 
-      curl https://raw.githubusercontent.com/DIRACGrid/DIRAC/integration/src/DIRAC/Core/scripts/install_full_py2.cfg -o install.cfg
+      curl https://raw.githubusercontent.com/DIRACGrid/DIRAC/integration/src/DIRAC/Core/scripts/install_full_py3.cfg -o install.cfg
 
   - Run install_site.sh giving the edited configuration file as the argument. The configuration file must have
     .cfg extension (CFG file). While not strictly necessary, it's advised that a version is added with the '-v' switch

docs/source/AdministratorGuide/Systems/MonitoringSystem/index.rst

@@ -123,10 +123,12 @@ Note: the JSON file already contains the index patterns needed for the visualiza
 Enable Component monitoring
 ===========================
 
-You have to set ``EnableActivityMonitoring=True`` in the CS.
-It can be done globally, the ``Operations`` section, or per single component.
+.. warning::
 
+    not yet fully working/ready
 
+You have to set ``EnableActivityMonitoring=True`` in the CS.
+It can be done globally, the ``Operations`` section, or per single component.
 
 Enable RMS Monitoring
 =====================

docs/source/AdministratorGuide/Tutorials/basicTutoSetup.rst

@@ -31,11 +31,7 @@ Basic requirements
 
 This section is to be executed as ``root`` user.
 
-We assume that you have at your disposition a fresh CC7 64bit installation. If you don't, we recommend installing a virtual machine. Instructions for installing CC7 can be found `here <http://linux.web.cern.ch/linux/centos7/docs/install.shtml>`_
-
-In this tutorial, we will use a freshly installed CC7 x86_64 virtual machine, with all the default options, except the hostname being ``dirac-tuto``.
-
-Make sure that the hostname of the machine is set to ``dirac-tuto``. Modify the ``HOSTNAME`` variable in the ``/etc/sysconfig/network`` file as such::
+In this tutorial, we will use a freshly installed CC7 x86_64 virtual machine, with all the default options, except the hostname being ``dirac-tuto``. Make sure that the hostname of the machine is set to ``dirac-tuto``. Modify the ``HOSTNAME`` variable in the ``/etc/sysconfig/network`` file as such::
 
   HOSTNAME=dirac-tuto
 
@@ -192,8 +188,6 @@ This section is to be run as ``dirac`` user in its home folder::
   sudo su dirac
   cd ~
 
-We will install DIRAC v6r21 with DIRACOS.
-
 First we create the ``install.cfg`` file, which is used to tell the installation script we obtain in a moment what to
 install and how to configure the server with the following content:
 
@@ -214,13 +208,6 @@ the user's home folder):
 
 The output should look something like this::
 
-  --2019-04-11 08:51:21--  https://raw.githubusercontent.com/DIRACGrid/management/master/dirac-install.py
-  Resolving github.com... 140.82.118.4, 140.82.118.3
-  Connecting to github.com|140.82.118.4|:443... connected.
-  HTTP request sent, awaiting response... 302 Found
-
-  [...]
-
   Status of installed components:
 
     Name                          Runit Uptime PID
@@ -479,30 +466,6 @@ the same version as for the server:
    :start-after: # START installClient1
    :end-before: # END installClient1
 
-The output from the ``dirac-install.py`` command should look something like this::
-
-  <SomeDate> dirac-install [NOTICE]  Processing installation requirements
-  <SomeDate> dirac-install [NOTICE]  Destination path for installation is /home/diracuser/DIRAC
-  <SomeDate> dirac-install [NOTICE]  Discovering modules to install
-  <SomeDate> dirac-install [NOTICE]  Installing modules...
-  <SomeDate> dirac-install [NOTICE]  Installing DIRAC:v6r21
-  <SomeDate> dirac-install [NOTICE]  Retrieving http://diracproject.web.cern.ch/diracproject/tars/DIRAC-v6r21.tar.gz
-  <SomeDate> dirac-install [NOTICE]  Retrieving http://diracproject.web.cern.ch/diracproject/tars/DIRAC-v6r21.md5
-  <SomeDate> dirac-install [NOTICE]  Deploying scripts...
-             Scripts will be deployed at /home/diracuser/DIRAC/scripts
-             Inspecting DIRAC module
-  <SomeDate> dirac-install [NOTICE]  Installing DIRAC OS ...
-  <SomeDate> dirac-install [NOTICE]  Retrieving https://diracos.web.cern.ch/diracos/releases/diracos-1.0.0.tar.gz ...........................................................................................................................
-  <SomeDate> dirac-install [NOTICE]  Retrieving https://diracos.web.cern.ch/diracos/releases/diracos-1.0.0.md5
-  <SomeDate> dirac-install [NOTICE]  Fixing externals paths...
-  <SomeDate> dirac-install [NOTICE]  Running externals post install...
-  <SomeDate> dirac-install [NOTICE]  Creating /home/diracuser/DIRAC/bashrc
-  <SomeDate> dirac-install [NOTICE]  Defaults written to defaults-DIRAC.cfg
-  <SomeDate> dirac-install [NOTICE]  Executing /home/diracuser/DIRAC/scripts/dirac-externals-requirements...
-  <SomeDate> dirac-install [NOTICE]  DIRAC properly installed
-
-You will notice that among other things, the installation created a ``~/DiracInstallation/bashrc`` file. This file must be sourced whenever you want to use dirac client.
-
 In principle, your system administrator will have managed the CA for you. In this specific case, since we have our own CA, we will just link the client installation CA with the server one:
 
 .. literalinclude:: basicTutoSetup.sh

docs/source/AdministratorGuide/Tutorials/basicTutoSetup.sh

@@ -224,10 +224,12 @@ chown -R diracuser:diracuser ~diracuser/.globus/
 
 cat > InstallDiracClient <<EOF
 # START installClient1
-mkdir -p ~/DiracInstallation && cd ~/DiracInstallation
-curl -O -L https://raw.githubusercontent.com/DIRACGrid/management/master/dirac-install.py
-chmod +x dirac-install.py
-./dirac-install.py -r v7r0p36 --dirac-os
+curl -LO https://github.com/DIRACGrid/DIRACOS2/releases/latest/download/DIRACOS-Linux-$(uname -m).sh
+bash DIRACOS-Linux-$(uname -m).sh
+rm -Rf DIRACOS-Linux-$(uname -m).sh
+source diracos/diracosrc
+cd ..
+pip install DIRAC
 # END installClient1
 # START installClient2
 mkdir -p ~/DiracInstallation/etc/grid-security/

docs/source/DeveloperGuide/AddingNewComponents/YourFirstDIRACCode/index.rst

@@ -73,9 +73,7 @@ We will put the unit test in DIRAC.Core.Utilities.test. The unit test has been f
      testResult = unittest.TextTestRunner(verbosity=2).run(suite)
 
 
-Now, try to run it. In case you are using Eclipse, it's time to try to run this test within Eclipse itself (run as: Python unit-test): it shows a graphical interface that you can find convenient. If you won't manage to run, it's probably because there is a missing configuration of the PYTHONPATH within Eclipse.
-
-Then, code ``checkCAOfUser`` and run the test again.
+Now, try to run it. Then, code ``checkCAOfUser`` and run the test again.
 
 
 Exercise 2

docs/source/DeveloperGuide/CodeTesting/index.rst

@@ -296,8 +296,7 @@ To run all tests in one command, which takes around 20 minutes, create a develop
 
     ./integration_tests.py create [FLAGS]
 
-Where ``[FLAGS]`` is one or more feature flags ``SERVER_USE_PYTHON3=Yes``.
-See ``.github/workflows/integration.yml`` for the available feature flags for your release.
+Where ``[FLAGS]`` is one or more feature flags. See ``.github/workflows/integration.yml`` for the available feature flags for your release.
 
 Once finished the containers can be removed using ``./integration_tests.py destroy``.
 
@@ -317,22 +316,15 @@ The first thing to do is that you should first login in the docker container, by
 
     ./integration_tests.py exec-server
 
-Now, if you're using Python 2 you will need to copy the test code:
-
-.. code-block:: bash
-
-    cp -r TestCode/DIRAC/tests/ ServerInstallDIR/DIRAC/
-
-while if you are using Python 3 server, the installations automatically pick up external changes to the DIRAC code and tests)
+The installations automatically pick up external changes to the DIRAC code and tests)
 
 Now you can run the test with:
 
 .. code-block:: bash
 
-    pytest ServerInstallDIR/DIRAC/tests/Integration/WorkloadManagementSystem/Test_JobDB.py (py2)
-    pytest LocalRepo/ALTERNATIVE_MODULES/DIRAC/tests/Integration/WorkloadManagementSystem/Test_JobDB.py (py3)
+    pytest LocalRepo/ALTERNATIVE_MODULES/DIRAC/tests/Integration/WorkloadManagementSystem/Test_JobDB.py
 
-For py3 installations, You can find the logs of the services in `/home/dirac/ServerInstallDIR/diracos/runit/`
+You can find the logs of the services in `/home/dirac/ServerInstallDIR/diracos/runit/`
 
 
 Validation and System tests

docs/source/DeveloperGuide/DevelopmentEnvironment/DeveloperInstallation/stuffThatRun.rst

@@ -47,9 +47,9 @@ Now you can run the test with:
 
 .. code-block:: bash
 
-    pytest LocalRepo/ALTERNATIVE_MODULES/DIRAC/tests/Integration/WorkloadManagementSystem/Test_JobDB.py (py3)
+    pytest LocalRepo/ALTERNATIVE_MODULES/DIRAC/tests/Integration/WorkloadManagementSystem/Test_JobDB.py
 
-For py3 installations, You can find the logs of the services in `/home/dirac/ServerInstallDIR/diracos/runit/`
+You can find the logs of the services in `/home/dirac/ServerInstallDIR/diracos/runit/`
 
 
 The Configuration Server (the CS)

docs/source/DeveloperGuide/DevelopmentModel/index.rst

@@ -13,8 +13,8 @@ The DIRACGrid project includes several repositories, all hosted in `Github <http
   - `DIRAC <https://github.com/DIRACGrid/DIRAC>`_ is the main repository: contains the client and server code
   - `WebAppDIRAC <https://github.com/DIRACGrid/WebAppDIRAC>`_ is the repository for the web portal
   - `Pilot <https://github.com/DIRACGrid/Pilot>`_ is *not* a DIRAC extension, but a new version of the DIRAC pilots (dubbed Pilots 3.0)
-  - `DIRACOS <https://github.com/DIRACGrid/DIRACOS>`_ is the repository for the DIRAC dependencies
-  - `DIRACOS2 <https://github.com/DIRACGrid/DIRACOS2>`_ is the python3 repository for the DIRAC dependencies
+  - `DIRACOS <https://github.com/DIRACGrid/DIRACOS>`_ is the repository for the old (py2) DIRAC dependencies
+  - `DIRACOS2 <https://github.com/DIRACGrid/DIRACOS2>`_ is the repository for the DIRAC dependencies (py3)
   - `COMDIRAC <https://github.com/DIRACGrid/COMDIRAC>`_ is a DIRAC extension of its CLI
   - `DB12 <https://github.com/DIRACGrid/DB12>`_ is *not* a DIRAC extension, but a self-contained quick benchmark
   - `management <https://github.com/DIRACGrid/management>`_ is *not* a DIRAC extension, but a repository for creating docker images used for tests and for creating releases

docs/source/DeveloperGuide/Externals/index.rst

@@ -4,12 +4,5 @@
 External Libraries and Dependencies
 ===================================
 
-
 The external libraries and dependencies required to run DIRAC Agents, Services, and Clients are
-contained in the `DIRACOS <https://github.com/DIRACGrid/DIRACOS/>`_. package for Python 2.7 installations,
-and in the `DIRACOS2 <https://github.com/DIRACGrid/DIRACOS2/>`_ package for Python 3 installations.
-
-The default version of ``DIRACOS`` to be used with a given version of DIRAC is defined in the
-``DIRAC/releases.cfg`` file. It can be overwritten with the ``--dirac-os-version`` flag for
-the `dirac-install` command. The documentation for creating a DIRACOS release or an extension
-of DIRACOS can be found `in its own documentation <https://diracos.readthedocs.io>`_.
+contained in the `DIRACOS2 <https://github.com/DIRACGrid/DIRACOS2/>`_ package for Python 3 installations.