docs: removed a bunch of py2 related documentation

fstagni · fstagni · commit 89d30cbf9c16 · 2021-11-30T17:20:03.000+01:00
diff --git a/docs/source/AdministratorGuide/ServerInstallations/InstallingDiracServer.rst b/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
diff --git a/docs/source/AdministratorGuide/Tutorials/basicTutoSetup.rst b/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
diff --git a/docs/source/AdministratorGuide/Tutorials/basicTutoSetup.sh b/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/
diff --git a/docs/source/DeveloperGuide/CodeTesting/index.rst b/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
diff --git a/docs/source/DeveloperGuide/DevelopmentEnvironment/DeveloperInstallation/stuffThatRun.rst b/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)
diff --git a/docs/source/DeveloperGuide/DevelopmentModel/index.rst b/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
diff --git a/docs/source/DeveloperGuide/Externals/index.rst b/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.
diff --git a/docs/source/DeveloperGuide/ReleaseProcedure/index.rst b/docs/source/DeveloperGuide/ReleaseProcedure/index.rst
@@ -35,8 +35,8 @@ The release manager of DIRAC should:
 4. Check the releases is on `PyPI <https://pypi.org/project/DIRAC/>`_ and make basic verifications
 5. Propagate to CVMFS
 
-1. Verify if new version of DIRACOS/2 is needed
-===============================================
+1. Verify if new version of DIRACOS2 is needed
+==============================================
 
 Code in open Pull Requests might be dependent from a new version of `DIRACOS2 <https://github.com/DIRACGrid/DIRACOS2>`_.
 Do verify for that before proceeding.
diff --git a/docs/source/DeveloperGuide/WebAppDIRAC/InstallWebAppDIRAC/index.rst b/docs/source/DeveloperGuide/WebAppDIRAC/InstallWebAppDIRAC/index.rst
@@ -15,12 +15,7 @@ Install WebAppDIRAC
 
 #. Create a directory where you will install DIRAC and WebAppDIRAC::
    git clone https://github.com/DIRACGrid/WebAppDIRAC.git
-   curl -O -L https://raw.githubusercontent.com/DIRACGrid/management/master/dirac-install.py
-   chmod +x dirac-install.py
-   ./dirac-install.py -r v7r2 -X -t server
-   source bashrc (we have to use the correct python in order to install tornado)
-   pip install tornado
-   mkdir etc
+   <ToDO>
 
 You need to create: vi etc/dirac.cfg file
 
diff --git a/src/DIRAC/Core/scripts/install_full_py2.cfg b/src/DIRAC/Core/scripts/install_full_py2.cfg
diff --git a/tests/Jenkins/utilities.sh b/tests/Jenkins/utilities.sh
@@ -1039,17 +1039,13 @@ downloadProxy() {
   cp "${TESTCODE}/DIRAC/tests/Jenkins/dirac-proxy-download.py" .
 
   if [[ "${PILOTCFG}" ]]; then
-    if [[ -e "${CLIENTINSTALLDIR}/etc/dirac.cfg" ]]; then # called from the client directory
-      python dirac-proxy-download.py "${DIRACUSERDN}" -R "${DIRACUSERROLE}" -o /DIRAC/Security/UseServerCertificate=True --cfg "${CLIENTINSTALLDIR}/etc/dirac.cfg" "${PILOTINSTALLDIR}/$PILOTCFG" "${DEBUG}"
-    elif [[ -e "${CLIENTINSTALLDIR}/diracos/etc/dirac.cfg" ]]; then # called from the py3 client directory
+    if [[ -e "${CLIENTINSTALLDIR}/diracos/etc/dirac.cfg" ]]; then # called from the py3 client directory
       python dirac-proxy-download.py "${DIRACUSERDN}" -R "${DIRACUSERROLE}" -o /DIRAC/Security/UseServerCertificate=True --cfg "${CLIENTINSTALLDIR}/diracos/etc/dirac.cfg" "${PILOTINSTALLDIR}/$PILOTCFG" "${DEBUG}"
     else # assuming it's the pilot
       python dirac-proxy-download.py "${DIRACUSERDN}" -R "${DIRACUSERROLE}" -o /DIRAC/Security/UseServerCertificate=True --cfg "${PILOTINSTALLDIR}/$PILOTCFG" "${DEBUG}"
     fi
   else
-    if [[ -e "${CLIENTINSTALLDIR}/etc/dirac.cfg" ]]; then # called from the client directory
-      python dirac-proxy-download.py "${DIRACUSERDN}" -R "${DIRACUSERROLE}" -o /DIRAC/Security/UseServerCertificate=True --cfg "${CLIENTINSTALLDIR}/etc/dirac.cfg" "${DEBUG}"
-    elif [[ -e "${CLIENTINSTALLDIR}/diracos/etc/dirac.cfg" ]]; then # called from the py3 client directory
+    if [[ -e "${CLIENTINSTALLDIR}/diracos/etc/dirac.cfg" ]]; then # called from the py3 client directory
       python dirac-proxy-download.py "${DIRACUSERDN}" -R "${DIRACUSERROLE}" -o /DIRAC/Security/UseServerCertificate=True --cfg "${CLIENTINSTALLDIR}/diracos/etc/dirac.cfg" "${PILOTINSTALLDIR}/$PILOTCFG" "${DEBUG}"
     else # assuming it's the pilot
       python dirac-proxy-download.py "${DIRACUSERDN}" -R "${DIRACUSERROLE}" -o /DIRAC/Security/UseServerCertificate=True --cfg "${PILOTINSTALLDIR}/etc/dirac.cfg" "${DEBUG}"
