Merge pull request #5743 from fstagni/80_fixes9

[8.0] removed isPy3VersionNumber function

Author: chrisburr

docs/source/AdministratorGuide/HowTo/SystemAdministratorInterface.rst

@@ -223,10 +223,9 @@ For example, start a service::
 
     WorkloadManagement_PilotManager : Run
 
-Restart services or agents or database server::
+Restart services or agents::
 
     restart <system|*> <service|agent|*>
-    restart mysql
 
 Restarting all the services and agents::
 

src/DIRAC/FrameworkSystem/Client/SystemAdministratorClientCLI.py

@@ -987,12 +987,11 @@ def do_start(self, args):
 
     def do_restart(self, args):
         """
-        Restart services or agents or database server
+        Restart components (services, agents, executors)
 
         usage:
 
           restart <system|*> <service|agent|*>
-          restart mysql
         """
         if not args:
             gLogger.notice(self.do_restart.__doc__)
@@ -1001,32 +1000,29 @@ def do_restart(self, args):
         argss = args.split()
         option = argss[0]
         del argss[0]
-        if option != "mysql":
-            if option != "*":
-                if len(argss) < 1:
-                    gLogger.notice(self.do_restart.__doc__)
-                    return
-            system = option
-            if system != "*":
-                component = argss[0]
-            else:
-                component = "*"
-            client = SystemAdministratorClient(self.host, self.port)
-            result = client.restartComponent(system, component)
-            if not result["OK"]:
-                if system == "*":
-                    gLogger.notice("All systems are restarted, connection to SystemAdministrator is lost")
-                else:
-                    self._errMsg(result["Message"])
+        if option != "*":
+            if len(argss) < 1:
+                gLogger.notice(self.do_restart.__doc__)
+                return
+        system = option
+        if system != "*":
+            component = argss[0]
+        else:
+            component = "*"
+        client = SystemAdministratorClient(self.host, self.port)
+        result = client.restartComponent(system, component)
+        if not result["OK"]:
+            if system == "*":
+                gLogger.notice("All systems are restarted, connection to SystemAdministrator is lost")
             else:
-                if system != "*" and component != "*":
-                    gLogger.notice("\n%s_%s started successfully, runit status:\n" % (system, component))
-                else:
-                    gLogger.notice("\nComponents started successfully, runit status:\n")
-                for comp in result["Value"]:
-                    gLogger.notice((comp.rjust(32), ":", result["Value"][comp]["RunitStatus"]))
+                self._errMsg(result["Message"])
         else:
-            gLogger.notice("Not yet implemented")
+            if system != "*" and component != "*":
+                gLogger.notice("\n%s_%s started successfully, runit status:\n" % (system, component))
+            else:
+                gLogger.notice("\nComponents started successfully, runit status:\n")
+            for comp in result["Value"]:
+                gLogger.notice((comp.rjust(32), ":", result["Value"][comp]["RunitStatus"]))
 
     def do_stop(self, args):
         """

src/DIRAC/FrameworkSystem/scripts/dirac_admin_update_instance.py

@@ -116,12 +116,6 @@ def updateHost(hostName, version):
             gLogger.error("Cannot connect to %s" % host)
             return result
 
-        # If the server is already running python 3,
-        # convert the version to be installed to python3
-        existingVersion = result["Value"]["version"]
-        if DIRAC.isPy3VersionNumber(existingVersion):
-            version = DIRAC.convertToPy3VersionNumber(version)
-
         gLogger.notice(
             "Initiating software update of %s to %s, this can take a while, please be patient ..." % (host, version)
         )

src/DIRAC/__init__.py

@@ -89,21 +89,6 @@
 alarmMail = "[email protected]"
 
 
-def isPy3VersionNumber(releaseVersion):
-    """Returns True if the releaseVersion is a PEP-440 style string.
-    This is the `is_canonical` function defined in PEP-440 Appendix B
-
-    :param str releaseVersion: The software version to use
-    """
-    return (
-        re.match(
-            r"^([1-9][0-9]*!)?(0|[1-9][0-9]*)(\.(0|[1-9][0-9]*))*((a|b|rc)(0|[1-9][0-9]*))?(\.post(0|[1-9][0-9]*))?(\.dev(0|[1-9][0-9]*))?$",
-            releaseVersion,
-        )
-        is not None
-    )
-
-
 def convertToPy3VersionNumber(releaseVersion):
     """Convert the releaseVersion into a PEP-440 style string