Pylint corrections

WattRex · Nov 21, 2023 · 792f5e1 · 792f5e1
1 parent 5b1724b
commit 792f5e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/code/drv_db/src/wattrex_driver_db/drv_db_dao_cache.py b/code/drv_db/src/wattrex_driver_db/drv_db_dao_cache.py
@@ -12,8 +12,7 @@
 #######################         GENERIC IMPORTS          #######################
 
 #######################       THIRD PARTY IMPORTS        #######################
-from sqlalchemy import (Column, Enum, PrimaryKeyConstraint, ForeignKeyConstraint, ForeignKey,
-                        DateTime, String)
+from sqlalchemy import Column, Enum, PrimaryKeyConstraint, ForeignKeyConstraint, DateTime, String
 from sqlalchemy.dialects.mysql import MEDIUMINT, INTEGER, SMALLINT
 from sqlalchemy.orm import declarative_base
 
@@ -66,7 +65,6 @@ class DrvDbCacheGenericMeasureC(Base):
     Voltage = Column(MEDIUMINT(), nullable=False)
     Current = Column(MEDIUMINT(), nullable=False)
     Power = Column(INTEGER())
-
     InstrID = Column(MEDIUMINT(unsigned=True), nullable=False)
     PowerMode = Column(Enum(*DrvDbCyclingModeE.get_all_values()), nullable= False)
 
@@ -76,7 +74,7 @@ class DrvDbCacheExtendedMeasureC(Base):
     '''
     __tablename__ = 'ExtendedMeasures'
     __table_args__ = (PrimaryKeyConstraint('ExpID', 'MeasID', 'UsedMeasID'),
-                    ForeignKeyConstraint(['ExpID', 'MeasID'], [DrvDbCacheGenericMeasureC.ExpID, 
+                    ForeignKeyConstraint(['ExpID', 'MeasID'], [DrvDbCacheGenericMeasureC.ExpID,
                                                             DrvDbCacheGenericMeasureC.MeasID]),)
 
     ExpID = Column(primary_key= True, nullable=False)
@@ -97,16 +95,3 @@ class DrvDbCacheStatusC(Base):
     Status = Column(Enum(*DrvDbEquipStatusE.get_all_values()), nullable=False)
     ErrorCode = Column(SMALLINT(unsigned=True), nullable=False)
     DevID = Column(MEDIUMINT(unsigned=True), nullable=False)
-
-# class DrvDbAlarmC(Base):
-#     '''
-#     Class method to create a base model of database Alarm table.
-#     '''
-#     __tablename__ = 'Alarm'
-#     __table_args__ = (ForeignKeyConstraint(['ExpID'], [DrvDbCacheExperimentC.ExpID]),)
-
-#     ExpID = Column(primary_key=True, nullable=False)
-#     AlarmID = Column(MEDIUMINT(unsigned=True), primary_key=True, nullable=False)
-#     Timestamp = Column(DateTime, nullable=False)
-#     Code = Column(MEDIUMINT(unsigned=True), nullable=False)
-#     Value = Column(MEDIUMINT(), nullable=False)
diff --git a/code/drv_db/src/wattrex_driver_db/drv_db_dao_master.py b/code/drv_db/src/wattrex_driver_db/drv_db_dao_master.py
@@ -258,7 +258,6 @@ class DrvDbMasterGenericMeasureC(DrvDbCacheGenericMeasureC): #pylint: disable=to
                       {'extend_existing': True},)
 
     InstrID = Column(nullable=False)
-    PowerMode = Column(Enum(*DrvDbCyclingModeE.get_all_values()))
 
 class DrvDbMasterExtendedMeasureC(DrvDbCacheExtendedMeasureC):
     '''