From aab135391a377c616e9886cc676f8bab05baf342 Mon Sep 17 00:00:00 2001 From: Chris Kerr Date: Wed, 15 May 2019 07:09:11 +0200 Subject: [PATCH] Change max-line-length to 100 and refactor all longer lines --- galvani/res2sqlite.py | 16 +++++++++++----- tox.ini | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/galvani/res2sqlite.py b/galvani/res2sqlite.py index 793092a..f31193f 100755 --- a/galvani/res2sqlite.py +++ b/galvani/res2sqlite.py @@ -353,10 +353,14 @@ DROP TABLE capacity_helper; CREATE VIEW IF NOT EXISTS Capacity_View AS SELECT Test_ID, Data_Point, Test_Time, Step_Time, DateTime, Step_Index, Cycle_Index, Current, Voltage, "dV/dt", - Discharge_Capacity + Discharge_Capacity_Sum - Charge_Capacity - Charge_Capacity_Sum AS Net_Capacity, - Discharge_Capacity + Discharge_Capacity_Sum + Charge_Capacity + Charge_Capacity_Sum AS Gross_Capacity, - Discharge_Energy + Discharge_Energy_Sum - Charge_Energy - Charge_Energy_Sum AS Net_Energy, - Discharge_Energy + Discharge_Energy_Sum + Charge_Energy + Charge_Energy_Sum AS Gross_Energy + ( (Discharge_Capacity + Discharge_Capacity_Sum) + - (Charge_Capacity + Charge_Capacity_Sum) ) AS Net_Capacity, + ( (Discharge_Capacity + Discharge_Capacity_Sum) + + (Charge_Capacity + Charge_Capacity_Sum) ) AS Gross_Capacity, + ( (Discharge_Energy + Discharge_Energy_Sum) + - (Charge_Energy + Charge_Energy_Sum) ) AS Net_Energy, + ( (Discharge_Energy + Discharge_Energy_Sum) + + (Charge_Energy + Charge_Energy_Sum) ) AS Gross_Energy FROM Channel_Normal_Table NATURAL JOIN Capacity_Sum_Table; """ @@ -452,7 +456,9 @@ def convert_arbin_to_sqlite(input_file, output_file): def main(argv=None): - parser = argparse.ArgumentParser(description="Convert Arbin .res files to sqlite3 databases using mdb-export") + parser = argparse.ArgumentParser( + description="Convert Arbin .res files to sqlite3 databases using mdb-export", + ) parser.add_argument('input_file', type=str) # need file name to pass to sp.Popen parser.add_argument('output_file', type=str) # need file name to pass to sqlite3.connect diff --git a/tox.ini b/tox.ini index a6ded79..8ccfc09 100644 --- a/tox.ini +++ b/tox.ini @@ -10,3 +10,4 @@ commands = [flake8] exclude = build,dist,*.egg-info,.cache,.git,.tox,__pycache__ +max-line-length = 100