From ad24a5c1a8c8623c30202f65f796efd4f983f540 Mon Sep 17 00:00:00 2001 From: Eric Tsai Date: Tue, 1 Sep 2020 13:59:34 -0700 Subject: [PATCH] styling with ptyhon black --- src/election_data_analysis/__init__.py | 44 ++++++++++++------- .../database/__init__.py | 22 +++++----- .../user_interface/__init__.py | 4 +- 3 files changed, 41 insertions(+), 29 deletions(-) diff --git a/src/election_data_analysis/__init__.py b/src/election_data_analysis/__init__.py index 8d5b66e03..2969c0f5f 100644 --- a/src/election_data_analysis/__init__.py +++ b/src/election_data_analysis/__init__.py @@ -56,7 +56,9 @@ def __new__(self): not create DataLoader object.""" try: d, parameter_err = ui.get_runtime_parameters( - multi_data_loader_pars, param_file="run_time.ini", header="election_data_analysis" + multi_data_loader_pars, + param_file="run_time.ini", + header="election_data_analysis", ) except FileNotFoundError as e: print( @@ -76,7 +78,9 @@ def __new__(self): def __init__(self): # grab parameters self.d, self.parameter_err = ui.get_runtime_parameters( - multi_data_loader_pars, param_file="run_time.ini", header="election_data_analysis" + multi_data_loader_pars, + param_file="run_time.ini", + header="election_data_analysis", ) # prepare to track files loaded, dictionary of dictionaries, keys are parameter file paths @@ -112,7 +116,7 @@ def load_all(self, load_jurisdictions: bool = True) -> dict: single_data_loader_pars, optional_keys=["aux_data_dir"], param_file=par_file, - header="election_data_analysis" + header="election_data_analysis", ) juris_path[f] = params[f]["jurisdiction_path"] # update file_tracker @@ -212,7 +216,9 @@ def move_loaded_results_file(self, sdl, f: str, load_error: dict): else: # move results file and its parameter file to a subfolder of the archive directory # named for the db - db_param = ui.get_runtime_parameters(["dbname"], "run_time.ini", "postgresql")[0] + db_param = ui.get_runtime_parameters( + ["dbname"], "run_time.ini", "postgresql" + )[0] self.tracker[f]["status"] = "loaded" new_dir = os.path.join(self.d["archive_dir"], db_param["dbname"]) ui.archive(f, self.d["results_dir"], new_dir) @@ -243,7 +249,7 @@ def __init__( single_data_loader_pars, optional_keys=["aux_data_dir"], param_file=par_file, - header="election_data_analysis" + header="election_data_analysis", ) # change any blank parameters to 'none' @@ -866,7 +872,7 @@ def __init__(self): prep_pars, optional_keys=optional_prep_pars, param_file="jurisdiction_prep.ini", - header="election_data_analysis" + header="election_data_analysis", ) self.state_house = int(self.d["count_of_state_house_districts"]) self.state_senate = int(self.d["count_of_state_senate_districts"]) @@ -928,7 +934,7 @@ def __init__(self): Session = sessionmaker(bind=eng) self.session = Session() - def display_options(self, input: str, verbose: bool=False, filters: list=None): + def display_options(self, input: str, verbose: bool = False, filters: list = None): if not verbose: results = db.get_input_options(self.session, input, False) else: @@ -959,7 +965,9 @@ def scatter( html, png, jpeg, webp, svg, pdf, and eps. Note that some filetypes may need plotly-orca installed as well.""" d, error = ui.get_runtime_parameters( - ["rollup_directory"], param_file="run_time.ini", header="election_data_analysis" + ["rollup_directory"], + param_file="run_time.ini", + header="election_data_analysis", ) if error: print("Parameter file missing requirements.") @@ -1008,14 +1016,16 @@ def scatter( def bar( self, - jurisdiction: str, - contest_type: str = None, - contest: str = None, - fig_type: str = None + jurisdiction: str, + contest_type: str = None, + contest: str = None, + fig_type: str = None, ) -> list: """contest_type is one of state, congressional, state-senate, state-house""" d, error = ui.get_runtime_parameters( - ["rollup_directory"], param_file="run_time.ini", header="election_data_analysis" + ["rollup_directory"], + param_file="run_time.ini", + header="election_data_analysis", ) if error: print("Parameter file missing requirements.") @@ -1025,7 +1035,7 @@ def bar( jurisdiction_id = db.name_to_id(self.session, "ReportingUnit", jurisdiction) # for now, bar charts can only handle jurisdictions where county is one level # down from the jurisdiction - most_granular_id = db.name_to_id( self.session, "ReportingUnitType", "county") + most_granular_id = db.name_to_id(self.session, "ReportingUnitType", "county") hierarchy = db.get_jurisdiction_hierarchy( self.session, jurisdiction_id, most_granular_id ) @@ -1057,10 +1067,12 @@ def split_category_input(self, input_str: str): selection_type = input_str[len(count_item_type) + 1 :] return count_item_type, selection_type - def export_outlier_data(self, jurisdiction: str, contest: str=None): + def export_outlier_data(self, jurisdiction: str, contest: str = None): """contest_type is one of state, congressional, state-senate, state-house""" d, error = ui.get_runtime_parameters( - ["rollup_directory"], param_file="run_time.ini", header="election_data_analysis" + ["rollup_directory"], + param_file="run_time.ini", + header="election_data_analysis", ) if error: print("Parameter file missing requirements.") diff --git a/src/election_data_analysis/database/__init__.py b/src/election_data_analysis/database/__init__.py index da4def3d5..d84825d62 100644 --- a/src/election_data_analysis/database/__init__.py +++ b/src/election_data_analysis/database/__init__.py @@ -80,13 +80,8 @@ Puerto Rico US Virgin Islands""" -db_pars = [ - "host", - "port", - "dbname", - "user", - "password" -] +db_pars = ["host", "port", "dbname", "user", "password"] + def get_database_names(con): """Return dataframe with one column called `datname` """ @@ -203,7 +198,7 @@ def create_new_db(project_root, param_file="run_time.ini"): # get connection to default postgres DB to create new one try: params = ui.get_runtime_parameters(db_pars, param_file, "postgresql")[0] - db_name = params["dbname"] + db_name = params["dbname"] params["dbname"] = "postgres" con = psycopg2.connect(**params) except: @@ -223,7 +218,8 @@ def create_new_db(project_root, param_file="run_time.ini"): if db_name in db_df.datname.unique(): # Clean out DB db_cdf.reset_db( - sess, os.path.join(project_root, "election_data_analysis", "CDF_schema_def_info") + sess, + os.path.join(project_root, "election_data_analysis", "CDF_schema_def_info"), ) else: create_database(con, cur, db_name) @@ -231,12 +227,16 @@ def create_new_db(project_root, param_file="run_time.ini"): # load cdf tables db_cdf.create_common_data_format_tables( sess, - dirpath=os.path.join(project_root, "election_data_analysis", "CDF_schema_def_info"), + dirpath=os.path.join( + project_root, "election_data_analysis", "CDF_schema_def_info" + ), ) db_cdf.fill_standard_tables( sess, None, - dirpath=os.path.join(project_root, "election_data_analysis/CDF_schema_def_info/"), + dirpath=os.path.join( + project_root, "election_data_analysis/CDF_schema_def_info/" + ), ) con.close() diff --git a/src/election_data_analysis/user_interface/__init__.py b/src/election_data_analysis/user_interface/__init__.py index 19268d4c9..0c5fe1cb4 100644 --- a/src/election_data_analysis/user_interface/__init__.py +++ b/src/election_data_analysis/user_interface/__init__.py @@ -589,10 +589,10 @@ def config( def get_runtime_parameters( - required_keys: list, + required_keys: list, param_file: str, header: str, - optional_keys: list = None, + optional_keys: list = None, ): d = {} missing_required_params = {"missing": []}