Merge pull request #6741 from chaen/v7r3_FIX_sqlAlchemy2.0

[7r3] fix sql alchemy2.0

Author: chrisburr

.github/workflows/basic-python3.yml

@@ -70,7 +70,7 @@ jobs:
           #   * `test_BaseType_Unicode` and `test_nestedStructure` fail due to
           #     DISET's string and unicode types being poorly defined
           - pytest --runslow -k 'not test_BaseType_Unicode and not test_nestedStructure'
-          - pylint -E src/
+          - pylint  -j 0 -E src/
 
     steps:
     - uses: actions/checkout@v3

environment-py3.yml

@@ -7,7 +7,6 @@ channels:
 
 dependencies:
   # Temporary workarounds
-  - astroid 2.5.6  # https://github.com/PyCQA/astroid/issues/1006 and https://github.com/PyCQA/astroid/issues/1007
   # runtime
   - python =3.9
   - pip
@@ -60,7 +59,7 @@ dependencies:
   - make
   - mock
   - parameterized
-  - pylint >=1.6.5
+  - pylint
   - pyparsing >=2.0.6
   - pytest >=3.6
   - pytest-cov >=2.2.0

src/DIRAC/ConfigurationSystem/Agent/GOCDB2CSAgent.py

@@ -59,7 +59,7 @@ def execute(self):
         for option, functionCall in GOCDB2CSAgent._functionMap.items():
             optionValue = self.am_getOption(option, True)
             if optionValue:
-                result = functionCall(self)
+                result = functionCall(self)  # pylint: disable=too-many-function-args
                 if not result["OK"]:
                     self.log.error("%s() failed with message: %s" % (functionCall.__name__, result["Message"]))
                 else:

src/DIRAC/Core/Utilities/Graphs/PlotBase.py

@@ -3,6 +3,9 @@
     The DIRAC Graphs package is derived from the GraphTool plotting package of the
     CMS/Phedex Project by ... <to be added>
 """
+# matplotlib dynamicaly defines all the get_xticklabels and the like,
+# so we just ignore it
+# pylint: disable=not-callable
 
 from __future__ import print_function
 from __future__ import absolute_import

src/DIRAC/Core/Utilities/Graphs/QualityMapGraph.py

@@ -172,10 +172,10 @@ def draw(self):
                 self.ax.set_xlim(xmin=start_plot, xmax=end_plot)
             else:
                 self.ax.set_xlim(xmin=min(tmp_x), xmax=max(tmp_x))
-        self.ax.set_yticks([i + 0.5 for i in range(nLabel)])
-        self.ax.set_yticklabels(labelNames)
-        setp(self.ax.get_xticklines(), markersize=0.0)
-        setp(self.ax.get_yticklines(), markersize=0.0)
+        self.ax.set_yticks([i + 0.5 for i in range(nLabel)])  # pylint: disable=not-callable
+        self.ax.set_yticklabels(labelNames)  # pylint: disable=not-callable
+        setp(self.ax.get_xticklines(), markersize=0.0)  # pylint: disable=not-callable
+        setp(self.ax.get_yticklines(), markersize=0.0)  # pylint: disable=not-callable
 
         cax, kw = make_axes(self.ax, orientation="vertical", fraction=0.07)
         cb = ColorbarBase(

src/DIRAC/Core/Utilities/Pfn.py

@@ -59,7 +59,7 @@ def srm_pfnunparse(pfnDict):
             # host:port
             uri = "%s:%s" % (pfnDict["Host"], pfnDict["Port"])
         if pfnDict["WSUrl"]:
-            if "?" in pfnDict["WSUrl"] and "=" in pfnDict["WSUrl"]:
+            if "?" in pfnDict["WSUrl"] and "=" in pfnDict["WSUrl"]:  # pylint: disable=unsupported-membership-test
                 # host/wsurl
                 # host:port/wsurl
                 uri = "%s%s" % (uri, pfnDict["WSUrl"])

src/DIRAC/DataManagementSystem/DB/FTS3DB.py

@@ -15,7 +15,7 @@
 from sqlalchemy.orm.exc import NoResultFound
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.sql.expression import and_
-from sqlalchemy.orm import relationship, sessionmaker, mapper
+from sqlalchemy.orm import relationship, sessionmaker
 from sqlalchemy.sql import update, delete
 from sqlalchemy import (
     create_engine,
@@ -34,6 +34,15 @@
     text,
 )
 
+try:
+    from sqlalchemy.orm import registry
+
+    sqlalchemy_mapper = registry().map_imperatively
+except ImportError:  # registry appeared in sqlalchemy 2.0
+    from sqlalchemy.orm import mapper
+
+    sqlalchemy_mapper = mapper
+
 # # from DIRAC
 from DIRAC import S_OK, S_ERROR, gLogger
 from DIRAC.DataManagementSystem.Client.FTS3Operation import FTS3Operation, FTS3TransferOperation, FTS3StagingOperation
@@ -69,7 +78,7 @@
     mysql_engine="InnoDB",
 )
 
-mapper(FTS3File, fts3FileTable)
+sqlalchemy_mapper(FTS3File, fts3FileTable)
 
 
 fts3JobTable = Table(
@@ -93,7 +102,7 @@
     mysql_engine="InnoDB",
 )
 
-mapper(FTS3Job, fts3JobTable)
+sqlalchemy_mapper(FTS3Job, fts3JobTable)
 
 
 fts3OperationTable = Table(
@@ -119,7 +128,7 @@
 )
 
 
-fts3Operation_mapper = mapper(
+fts3Operation_mapper = sqlalchemy_mapper(
     FTS3Operation,
     fts3OperationTable,
     properties={
@@ -146,9 +155,13 @@
     polymorphic_identity="Abs",
 )
 
-mapper(FTS3TransferOperation, fts3OperationTable, inherits=fts3Operation_mapper, polymorphic_identity="Transfer")
+sqlalchemy_mapper(
+    FTS3TransferOperation, fts3OperationTable, inherits=fts3Operation_mapper, polymorphic_identity="Transfer"
+)
 
-mapper(FTS3StagingOperation, fts3OperationTable, inherits=fts3Operation_mapper, polymorphic_identity="Staging")
+sqlalchemy_mapper(
+    FTS3StagingOperation, fts3OperationTable, inherits=fts3Operation_mapper, polymorphic_identity="Staging"
+)
 
 
 # About synchronize_session:

src/DIRAC/MonitoringSystem/DB/MonitoringDB.py

@@ -214,7 +214,7 @@ def retrieveBucketedData(
                     continue
                 kwargs = {cond: condValue}
                 if query:
-                    query = query | self._Q("term", **kwargs)
+                    query = query | self._Q("term", **kwargs)  # pylint: disable=unsupported-binary-operation
                 else:
                     query = self._Q("term", **kwargs)
             if query:
@@ -349,7 +349,7 @@ def retrieveAggregatedData(
                     continue
                 kwargs = {cond: condValue}
                 if query:
-                    query = query | self._Q("term", **kwargs)
+                    query = query | self._Q("term", **kwargs)  # pylint: disable=unsupported-binary-operation
                 else:
                     query = self._Q("term", **kwargs)
             if query:

src/DIRAC/RequestManagementSystem/DB/RequestDB.py

@@ -3,6 +3,8 @@
 # pylint: disable=no-member
 ########################################################################
 
+# We disable pylint no-callable because of https://github.com/PyCQA/pylint/issues/8138
+
 """ Frontend for ReqDB
 
     :mod: RequestDB
@@ -26,7 +28,7 @@
 import datetime
 
 from sqlalchemy.orm.exc import NoResultFound
-from sqlalchemy.orm import relationship, backref, sessionmaker, joinedload, mapper
+from sqlalchemy.orm import relationship, backref, sessionmaker, joinedload
 from sqlalchemy.sql import update
 from sqlalchemy import (
     create_engine,
@@ -44,6 +46,15 @@
     distinct,
 )
 
+try:
+    from sqlalchemy.orm import registry
+
+    sqlalchemy_mapper = registry().map_imperatively
+except ImportError:  # registry appeared in sqlalchemy 2.0
+    from sqlalchemy.orm import mapper
+
+    sqlalchemy_mapper = mapper
+
 # # from DIRAC
 from DIRAC import S_OK, S_ERROR, gLogger
 from DIRAC.RequestManagementSystem.Client.Request import Request
@@ -80,7 +91,7 @@
 
 # Map the File object to the fileTable, with a few special attributes
 
-mapper(
+sqlalchemy_mapper(
     File,
     fileTable,
     properties={
@@ -120,7 +131,7 @@
 
 # Map the Operation object to the operationTable, with a few special attributes
 
-mapper(
+sqlalchemy_mapper(
     Operation,
     operationTable,
     properties={
@@ -164,7 +175,7 @@
 )
 
 # Map the Request object to the requestTable, with a few special attributes
-mapper(
+sqlalchemy_mapper(
     Request,
     requestTable,
     properties={
@@ -402,7 +413,7 @@ def getRequest(self, reqID=0, assigned=True):
             # the joinedload is to force the non-lazy loading of all the attributes, especially _parent
             request = (
                 session.query(Request)
-                .options(joinedload("__operations__").joinedload("__files__"))
+                .options(joinedload(Request.__operations__).joinedload(Operation.__files__))
                 .filter(Request.RequestID == requestID)
                 .one()
             )
@@ -467,7 +478,7 @@ def getBulkRequests(self, numberOfRequest=10, assigned=True):
 
                 requests = (
                     session.query(Request)
-                    .options(joinedload("__operations__").joinedload("__files__"))
+                    .options(joinedload(Request.__operations__).joinedload(Operation.__files__))
                     .filter(Request.RequestID.in_(requestIDs))
                     .all()
                 )
@@ -564,21 +575,31 @@ def getDBSummary(self):
         session = self.DBSession()
 
         try:
-            requestQuery = session.query(Request._Status, func.count(Request.RequestID)).group_by(Request._Status).all()
+            requestQuery = (
+                session.query(Request._Status, func.count(Request.RequestID))  # pylint: disable=not-callable
+                .group_by(Request._Status)
+                .all()
+            )
 
             for status, count in requestQuery:
                 retDict["Request"][status] = count
 
             operationQuery = (
-                session.query(Operation.Type, Operation._Status, func.count(Operation.OperationID))
+                session.query(
+                    Operation.Type, Operation._Status, func.count(Operation.OperationID)  # pylint: disable=not-callable
+                )
                 .group_by(Operation.Type, Operation._Status)
                 .all()
             )
 
             for oType, status, count in operationQuery:
                 retDict["Operation"].setdefault(oType, {})[status] = count
 
-            fileQuery = session.query(File._Status, func.count(File.FileID)).group_by(File._Status).all()
+            fileQuery = (
+                session.query(File._Status, func.count(File.FileID))  # pylint: disable=not-callable
+                .group_by(File._Status)
+                .all()
+            )
 
             for status, count in fileQuery:
                 retDict["File"][status] = count
@@ -726,7 +747,9 @@ def getRequestCountersWeb(self, groupingAttribute, selectDict):
             groupingAttribute = "Request.%s" % groupingAttribute
 
         try:
-            summaryQuery = session.query(eval(groupingAttribute), func.count(Request.RequestID))
+            summaryQuery = session.query(
+                eval(groupingAttribute), func.count(Request.RequestID)  # pylint: disable=not-callable
+            )
 
             for key, value in selectDict.items():
                 if key == "ToDate":
@@ -840,7 +863,7 @@ def readRequestsForJobs(self, jobIDs=None):
         try:
             ret = (
                 session.query(Request.JobID, Request)
-                .options(joinedload("__operations__").joinedload("__files__"))
+                .options(joinedload(Request.__operations__).joinedload(Operation.__files__))
                 .filter(Request.JobID.in_(jobIDs))
                 .all()
             )

src/DIRAC/ResourceStatusSystem/Command/test/Test_RSS_Command_VOBOXAvailabilityCommand.py

@@ -15,7 +15,7 @@
 
 try:
     # Python 2: "reload" is built-in
-    reload
+    reload  # pylint: disable=used-before-assignment
 except NameError:
     from importlib import reload  # pylint: disable=no-name-in-module