Merge pull request #7063 from fstagni/80_fixes61

[8.0] Fixed pyparsing import

Author: chrisburr

src/DIRAC/Resources/Catalog/FCConditionParser.py

@@ -1,7 +1,7 @@
 """
    Contains the mechanism to evaluate whether to use or not a catalog
 """
-from pyparsing import infixNotation, opAssoc, Word, printables, Literal, Suppress
+from pyparsing import infix_notation, opAssoc, Word, printables, Literal, Suppress
 
 from DIRAC import S_OK, gLogger
 from DIRAC.Core.Utilities.ObjectLoader import ObjectLoader
@@ -131,7 +131,7 @@ def __str__(self):
 
     # We can combine the pluginOperand with boolean expression,
     # and prioritized by squared bracket
-    __boolExpr = infixNotation(
+    __boolExpr = infix_notation(
         __pluginOperand,
         [
             ("!", 1, opAssoc.RIGHT, _BoolNot),

src/DIRAC/__init__.py

@@ -323,6 +323,5 @@ def extension_metadata():
         "priority": 0,
         "setups": {
             "DIRAC-Certification": "https://lbcertifdirac70.cern.ch:9135/Configuration/Server",
-            "DIRAC-CertifOauth": "https://lbcertifdiracoauth.cern.ch:9135/Configuration/Server",
         },
     }