Merge pull request #216 from PanDAWMS/oracledb

Migrate cx_Oracle to oracledb

pandajedi/jedicore/JediDBProxy.py

@@ -43,10 +43,13 @@ def get_database_backend():
  import psycopg2 as psycopg
 
  varNUMBER = int
+
 else:
- import cx_Oracle
+ import oracledb
 
- varNUMBER = cx_Oracle.NUMBER
+ # If we were to make a connection to the database, we would need to initialize the Oracle client
+ # oracledb.init_oracle_client()
+ varNUMBER = oracledb.NUMBER
 
 # add handlers of filtered logger
 tmpLoggerFiltered = PandaLogger().getLogger(__name__.split(".")[-1] + "Filtered")

pandajedi/jeditest/resubmitTaskParam.py

@@ -1,19 +1,12 @@
-import datetime
-import os
-import re
 import sys
-import threading
-import time
 
-from config import panda_config
-from pandajedi.jediconfig import jedi_config
-from pandajedi.jedicore import JediTaskBuffer
-from pandalogger.PandaLogger import PandaLogger
 from taskbuffer.Initializer import initializer
 
+from pandajedi.jedicore import JediTaskBuffer
+
 jediTaskID = sys.argv[1]
 
-# initialize cx_Oracle using dummy connection
+# initialize DB using dummy connection
 initializer.init()
 
 

pandajedi/jeditest/workQueueTest.py

@@ -1,7 +1,8 @@
-from pandajedi.jedicore import JediTaskBuffer
 from taskbuffer.Initializer import initializer
 
-# initialize cx_Oracle using dummy connection
+from pandajedi.jedicore import JediTaskBuffer
+
+# initialize DB using dummy connection
 initializer.init()
 
 taskBuffer = JediTaskBuffer.JediTaskBuffer(None)

pyproject.toml

@@ -13,7 +13,7 @@ authors = [
 ]
 dependencies = [
  'panda-common>=0.0.38',
- 'panda-server>=0.0.37',
+ 'panda-server>=0.3.0',
  'python-daemon',
  'numpy',
  'pyyaml',
@@ -23,12 +23,12 @@ dependencies = [
 requires-python = ">=3.8"
 
 [project.optional-dependencies]
-oracle = ['cx_Oracle']
+oracle = ['oracledb']
 mysql = ['mysqlclient']
 postgres = ['psycopg2-binary']
 rucio = ['rucio-clients']
 elasticsearch = ['elasticsearch']
-atlasprod = ['cx_Oracle', 'rucio-clients', 'idds-common', 'idds-client']
+atlasprod = ['oracledb', 'rucio-clients', 'idds-common', 'idds-client']
 
 [project.urls]
 Homepage = "https://panda-wms.readthedocs.io/en/latest/"