Merge pull request #5712 from fstagni/80_fixes8

[8.0] re-allowing rucio

Author: chrisburr

.pylintrc

@@ -142,7 +142,7 @@ generated-members=REQUEST,acl_users,aq_parent
 # List of ignored modules
 # (useful for classes with attributes dynamically set).
 # subprocess32 is disabled due to https://github.com/PyCQA/astroid/issues/911
-ignored-modules = MySQLdb,numpy,six.moves.urllib,subprocess32,rucio
+ignored-modules = MySQLdb,numpy,six.moves.urllib,subprocess32
 
 [VARIABLES]
 

docs/diracdoctools/__init__.py

@@ -21,6 +21,4 @@
     "pylab",
     "pythonjsonlogger",
     "stomp",
-    # Doesn't support Python 3.9
-    "rucio",
 ]

environment.yml

@@ -87,6 +87,7 @@ dependencies:
   #- tornado >=5.0.0,<6.0.0
   - typing >=3.6.6
   - pyyaml
+  - rucio-clients
   - pip:
     # Prerelease of the required package for integration of OAuth2
     - Authlib>=1.0.0.a2
@@ -98,5 +99,4 @@ dependencies:
     # This is an extension of Tornado to use M2Crypto
     # It should eventually be part of DIRACGrid
     - git+https://github.com/DIRACGrid/tornado_m2crypto
-    - rucio-clients >=1.26.0rc1
     - -e .

setup.cfg

@@ -46,8 +46,7 @@ install_requires =
     python-dateutil
     pytz
     requests
-    # Doesn't support Python 3.9
-    # rucio-clients >=1.25.6
+    rucio-clients
     setuptools
     six
     sqlalchemy

tests/Jenkins/dirac_ci.sh

@@ -343,7 +343,7 @@ fullInstallDIRAC() {
   dirac-admin-allow-se SE-1 SE-2 S3-DIRECT S3-INDIRECT --All
 
   #agents
-  findAgents 'exclude' 'Rucio'
+  findAgents
   if ! diracAgents; then
     echo "ERROR: diracAgents failed"
     exit 1