diff --git a/mica/archive/aca_dark/dark_cal.py b/mica/archive/aca_dark/dark_cal.py index b38ed209..e4db3efb 100644 --- a/mica/archive/aca_dark/dark_cal.py +++ b/mica/archive/aca_dark/dark_cal.py @@ -141,7 +141,7 @@ def _get_dark_cal_id_scalar(date, select="before", dark_cal_ids=None): if ii < 0: earliest = CxoTime(dark_cal_secs[0]).date[:8] raise MissingDataError( - f"No dark cal found before {earliest}" f"(requested dark cal on {date})" + f"No dark cal found before {earliest}(requested dark cal on {date})" ) try: diff --git a/mica/archive/cda/services.py b/mica/archive/cda/services.py index 09a4ae37..55cec32d 100644 --- a/mica/archive/cda/services.py +++ b/mica/archive/cda/services.py @@ -430,8 +430,7 @@ def _get_cda_service_text(service, timeout=60, **params): if not resp.ok: raise RuntimeError( - f"got error {resp.status_code} for {resp.url}\n" - f"{html_to_text(resp.text)}" + f"got error {resp.status_code} for {resp.url}\n{html_to_text(resp.text)}" ) return resp.text @@ -630,7 +629,7 @@ def get_ocat_local( # accurate enough for this application. where = ( f"arccos(sin({ra * d2r})*sin(ra*{d2r}) + " - f"cos({ra * d2r})*cos(ra*{d2r})*cos({dec*d2r}-dec*{d2r}))" + f"cos({ra * d2r})*cos(ra*{d2r})*cos({dec * d2r}-dec*{d2r}))" f"< {radius / 60 * d2r}" ) where_parts.append(where) diff --git a/mica/centroid_dashboard.py b/mica/centroid_dashboard.py index f3774e4d..2df78fa4 100755 --- a/mica/centroid_dashboard.py +++ b/mica/centroid_dashboard.py @@ -1182,7 +1182,7 @@ def make_html(row_obsid, rows_slot, obs_dir): for row in t_slot: string += f""" -{row['slot']} +{row["slot"]} """ if row["id"] < 100: id_ = "" @@ -1193,13 +1193,13 @@ def make_html(row_obsid, rows_slot, obs_dir): ) string += f"""{id_} -{row['type']} -{row['mag']} -{row['yang']} -{row['zang']} -{row['median_mag']:.3f} -{row['median_dy']:.2f} -{row['median_dz']:.2f} +{row["type"]} +{row["mag"]} +{row["yang"]} +{row["zang"]} +{row["median_mag"]:.3f} +{row["median_dy"]:.2f} +{row["median_dz"]:.2f} """ string += f""" diff --git a/mica/report/report.py b/mica/report/report.py index 9a148379..95fed986 100644 --- a/mica/report/report.py +++ b/mica/report/report.py @@ -920,9 +920,9 @@ def save_state_in_db(obsid, notes): del notes["last_sched"] idcheck = db.fetchone( - "select * from report_proc " - "where obsid = '{}' " - "and report_version = '{}'".format(obsid, REPORT_VERSION) + "select * from report_proc where obsid = '{}' and report_version = '{}'".format( + obsid, REPORT_VERSION + ) ) if idcheck is None: diff --git a/mica/stats/update_acq_stats.py b/mica/stats/update_acq_stats.py index 2e68be65..8e34202e 100755 --- a/mica/stats/update_acq_stats.py +++ b/mica/stats/update_acq_stats.py @@ -126,8 +126,7 @@ def get_options(): parser.add_argument( "--email", action="append", - help="email warning recipient, specify multiple times " - "for multiple recipients", + help="email warning recipient, specify multiple times for multiple recipients", ) opt = parser.parse_args() return opt diff --git a/mica/vv/process.py b/mica/vv/process.py index 5eb91633..f67103a0 100644 --- a/mica/vv/process.py +++ b/mica/vv/process.py @@ -158,7 +158,7 @@ def update(obsids=None): logger.warn(f"Skipping obs:ver {obsid}:{obs['revision']}. Missing data") continue update_str = f"""UPDATE aspect_1_proc set vv_complete = {VV_VERSION} - where obsid = {obsid} and revision = {obs['revision']}""" + where obsid = {obsid} and revision = {obs["revision"]}""" logger.info(update_str) with ska_dbi.DBI(dbi="sqlite", server=FILES["asp1_proc_table"]) as db: diff --git a/mica/web/views.py b/mica/web/views.py index 2b84c62b..79cebaae 100644 --- a/mica/web/views.py +++ b/mica/web/views.py @@ -83,7 +83,7 @@ def get_context_data(self, **kwargs): context["gui_table"] = gui_table reports_url = ( "https://cxc.cfa.harvard.edu/mta/ASPECT/agasc/supplement_reports/stars/" - f"{int(agasc_id//1e7):03d}/{agasc_id}/index.html" + f"{int(agasc_id // 1e7):03d}/{agasc_id}/index.html" ) context["reports_url"] = reports_url return context diff --git a/scripts/update_agasc_supplement.py b/scripts/update_agasc_supplement.py index 83943095..73ee246e 100644 --- a/scripts/update_agasc_supplement.py +++ b/scripts/update_agasc_supplement.py @@ -38,8 +38,7 @@ def get_options(args=None): "--bad-star-source", type=int, help=( - "Source identifier indicating provenance (default=max " - "existing source + 1)" + "Source identifier indicating provenance (default=max existing source + 1)" ), ) parser.add_argument(