[pre-commit.ci] pre-commit autoupdate

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
       - id: name-tests-test
       - id: end-of-file-fixer
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.17
+    rev: v0.16.0
     hooks:
       # Run the linter.
       - id: ruff-check

src/exoverses/base/planet.py

@@ -5,7 +5,7 @@
 from astropy.time import Time
 from keplertools import fun as kt
 
-import exoverses.util.misc as misc
+from exoverses.util import misc
 
 
 class Planet:

src/exoverses/base/system.py

@@ -8,7 +8,7 @@
 from keplertools import fun as kt
 from tqdm import tqdm
 
-import exoverses.util.misc as misc
+from exoverses.util import misc
 
 
 class System:

src/exoverses/exovista/disk.py

@@ -3,7 +3,7 @@
 from astropy.io import fits
 from scipy.interpolate import interp1d
 
-import exoverses.base as base
+from exoverses import base
 
 
 class ExovistaDisk(base.disk.Disk):

src/exoverses/exovista/planet.py

@@ -4,7 +4,7 @@
 from astropy.time import Time
 from scipy.interpolate import RectBivariateSpline
 
-import exoverses.base as base
+from exoverses import base
 
 
 class ExovistaPlanet(base.planet.Planet):

src/exoverses/exovista/star.py

@@ -6,7 +6,7 @@
 from astropy.time import Time
 from scipy.interpolate import RectBivariateSpline
 
-import exoverses.base as base
+from exoverses import base
 
 
 class ExovistaStar(base.star.Star):

src/exoverses/exovista/universe.py

@@ -3,10 +3,10 @@
 import subprocess
 from pathlib import Path
 
-import astropy.io.fits as fits
 import dill
 import numpy as np
 import pandas as pd
+from astropy.io import fits
 from exovista import (
     Settings,
     generate_disks,
@@ -183,7 +183,7 @@ def generate_systems(
     else:
         stars, _ = load_stars.load_stars(targetlist, from_master=True)
         nexozodis = np.full(len(stars), nexozodis)
-    print("\n{0:d} stars in model ranges.".format(len(stars)))
+    print(f"\n{len(stars):d} stars in model ranges.")
 
     planets, albedos = generate_planets.generate_planets(
         stars, settings, force_earth=False
@@ -203,7 +203,7 @@ def generate_systems(
     pool = multiprocessing.Pool(cores)
 
     inputs = []
-    for i in range(0, cores):
+    for i in range(cores):
         imin = i * percore
         imax = (i + 1) * percore
         inputs.append(
@@ -217,7 +217,7 @@ def generate_systems(
             ]
         )
 
-    pool.starmap(generate_scene.generate_scene, [inputs[j][:] for j in range(0, cores)])
+    pool.starmap(generate_scene.generate_scene, [inputs[j][:] for j in range(cores)])
     pool.close()
     pool.join()
 
@@ -229,7 +229,6 @@ def runcmd(cmd, verbose=False):
     std_out, std_err = process.communicate()
     if verbose:
         print(std_out.strip(), std_err)
-    pass
 
 
 def get_data(universes=np.arange(1, 13), cache_location="data"):

src/exoverses/fit/__init__.py

@@ -1 +1 @@
-__all__ = ["universe.py", "system.py", "star.py", "planet.py"]
+__all__ = ["planet.py", "star.py", "system.py", "universe.py"]

src/exoverses/fit/planet.py

@@ -3,8 +3,8 @@
 import numpy as np
 from astropy.time import Time
 
-import exoverses.util.misc as misc
 from exoverses.base.planet import Planet
+from exoverses.util import misc
 
 
 class FitPlanet(Planet):
@@ -40,7 +40,7 @@ def __init__(self, planet_dict, true_system):
         # Finding the mean anomaly at time of conjunction
         nu_p = (np.pi / 2 * u.rad - self.w_s) % (2 * np.pi * u.rad)
         E_p = 2 * np.arctan2(
-            np.sqrt((1 - self.e)) * np.tan(nu_p / 2), np.sqrt((1 + self.e))
+            np.sqrt(1 - self.e) * np.tan(nu_p / 2), np.sqrt(1 + self.e)
         )
         self.M0 = (E_p - self.e * np.sin(E_p) * u.rad) % (2 * np.pi * u.rad)
         self.t0 = Time(self.T_c.jd, format="jd")

src/exoverses/util/__init__.py

@@ -1,21 +1,21 @@
 __all__ = [
-    "timetrans_to_timeperi",
-    "timeperi_to_timetrans",
     "Msini",
-    "rotate_vectors",
-    "gen_rotate_to_sky_coords",
-    "gen_rotate_to_local_ecliptic_coords",
-    "drop_nan_coord_values",
     "add_units",
+    "drop_nan_coord_values",
+    "gen_rotate_to_local_ecliptic_coords",
+    "gen_rotate_to_sky_coords",
+    "rotate_vectors",
+    "timeperi_to_timetrans",
+    "timetrans_to_timeperi",
 ]
 
 from .misc import (
-    timetrans_to_timeperi,
-    timeperi_to_timetrans,
     Msini,
-    rotate_vectors,
-    gen_rotate_to_sky_coords,
-    gen_rotate_to_local_ecliptic_coords,
-    drop_nan_coord_values,
     add_units,
+    drop_nan_coord_values,
+    gen_rotate_to_local_ecliptic_coords,
+    gen_rotate_to_sky_coords,
+    rotate_vectors,
+    timeperi_to_timetrans,
+    timetrans_to_timeperi,
 )

src/exoverses/util/misc.py

@@ -203,9 +203,7 @@ def gen_rotate_to_sky_coords(
         vector[:, 2] = -vector[:, 2]
     else:
         raise Exception(
-            "Convention must be either 'exovista' or 'radvel', got {}".format(
-                convention
-            )
+            f"Convention must be either 'exovista' or 'radvel', got {convention}"
         )
     return vector