Ruff format 2025

artis-mcrt · Jan 16, 2025 · ee1d015 · ee1d015
1 parent 8183e1b
commit ee1d015
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/artisatomic/__init__.py b/artisatomic/__init__.py
@@ -1618,8 +1618,8 @@ def write_adata(
     transition_count_of_level_name,
     flog,
 ) -> None:
-    log_and_print(flog, f"Writing {dfenergylevels.height-1} levels to 'adata.txt'")
-    fatommodels.write(f"{atomic_number:12d}{ion_stage:12d}{dfenergylevels.height-1:12d}{ionization_energy:15.7f}\n")
+    log_and_print(flog, f"Writing {dfenergylevels.height - 1} levels to 'adata.txt'")
+    fatommodels.write(f"{atomic_number:12d}{ion_stage:12d}{dfenergylevels.height - 1:12d}{ionization_energy:15.7f}\n")
 
     for energylevel in dfenergylevels[1:].iter_rows(named=True):
         transitioncount = (
@@ -1639,21 +1639,21 @@ def write_adata(
         if "indexinsymmetry" in energylevel:
             if energylevel["indexinsymmetry"] >= 0:
                 level_comment += (
-                    f'Nahar: {energylevel["twosplusone"]:d}{lchars[energylevel["l"]]:}{["e", "o"][energylevel["parity"]]:} index'
-                    f" {energylevel["indexinsymmetry"]:}"
+                    f"Nahar: {energylevel['twosplusone']:d}{lchars[energylevel['l']]:}{['e', 'o'][energylevel['parity']]:} index"
+                    f" {energylevel['indexinsymmetry']:}"
                 )
                 if "naharconfiguration" in energylevel:
                     config = energylevel["naharconfiguration"]
                     if energylevel["naharconfiguration"].strip() in nahar_configuration_replacements:
-                        config += f" replaced by {nahar_configuration_replacements[energylevel["naharconfiguration"].strip()]}"
+                        config += f" replaced by {nahar_configuration_replacements[energylevel['naharconfiguration'].strip()]}"
                     level_comment += f" '{config}'"
                 else:
                     level_comment += " (no config)"
         else:
             level_comment = level_comment.rstrip()
 
         fatommodels.write(
-            f"{energylevel["levelid"]:5d} {hc_in_ev_cm * float(energylevel["energyabovegsinpercm"]):19.16f} {float(energylevel["g"]):8.3f} {transitioncount:4d} {level_comment:}\n"
+            f"{energylevel['levelid']:5d} {hc_in_ev_cm * float(energylevel['energyabovegsinpercm']):19.16f} {float(energylevel['g']):8.3f} {transitioncount:4d} {level_comment:}\n"
         )
 
     fatommodels.write("\n")

diff --git a/artisatomic/readqubdata.py b/artisatomic/readqubdata.py
@@ -83,7 +83,7 @@ def read_adf04(filepath, flog):
                 artisatomic.log_and_print(
                     flog,
                     f"Duplicate upsilon value for transition {lower:d} to {upper:d} keeping"
-                    f" {upsilondict[(lower, upper)],:5.2e} instead of using {upsilon:5.2e}",
+                    f" {(upsilondict[(lower, upper)],):5.2e} instead of using {upsilon:5.2e}",
                 )
 
     artisatomic.log_and_print(flog, f"Read {len(energylevels[1:]):d} levels")

diff --git a/atomic-data-nahar/download-nahar.py b/atomic-data-nahar/download-nahar.py
@@ -62,7 +62,7 @@ def main():
         if Path(file).exists():
             print(f"{file} already exists. Skipping.")
         else:
-            url = f'https://norad.astronomy.osu.edu/{file.split(".")[0]}/{file}'
+            url = f"https://norad.astronomy.osu.edu/{file.split('.')[0]}/{file}"
 
             c = urllib3.PoolManager()
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -43,7 +43,7 @@ dev = [
     "mypy>=1.13.0",
     "pre-commit>=4.0.1",
     "pytest>=8.3.3",
-    "ruff>=0.8.3",
+    "ruff>=0.9.1",
     "types-requests>=2.32.0.20241016",
 ]