From 16f50747b420e338a889e64a97c7b3f28d2ca012 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2026 18:01:51 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.15.17 → v0.16.0](https://github.com/astral-sh/ruff-pre-commit/compare/v0.15.17...v0.16.0) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7872e3b..6762a26 100644 --- a/.pre-commit-config.yaml +++ b/.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 From 61a3460b255cf71f349c332023cd552f04f5db68 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2026 18:02:07 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/exoverses/base/planet.py | 2 +- src/exoverses/base/system.py | 2 +- src/exoverses/exovista/disk.py | 2 +- src/exoverses/exovista/planet.py | 2 +- src/exoverses/exovista/star.py | 2 +- src/exoverses/exovista/universe.py | 9 ++++----- src/exoverses/fit/__init__.py | 2 +- src/exoverses/fit/planet.py | 4 ++-- src/exoverses/util/__init__.py | 24 ++++++++++++------------ src/exoverses/util/misc.py | 4 +--- 10 files changed, 25 insertions(+), 28 deletions(-) diff --git a/src/exoverses/base/planet.py b/src/exoverses/base/planet.py index dfd1223..d4f6429 100644 --- a/src/exoverses/base/planet.py +++ b/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: diff --git a/src/exoverses/base/system.py b/src/exoverses/base/system.py index 30f14a1..a7f4e7d 100644 --- a/src/exoverses/base/system.py +++ b/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: diff --git a/src/exoverses/exovista/disk.py b/src/exoverses/exovista/disk.py index 75a69af..2a50bd7 100644 --- a/src/exoverses/exovista/disk.py +++ b/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): diff --git a/src/exoverses/exovista/planet.py b/src/exoverses/exovista/planet.py index 8518e00..e3bfe72 100644 --- a/src/exoverses/exovista/planet.py +++ b/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): diff --git a/src/exoverses/exovista/star.py b/src/exoverses/exovista/star.py index 8f3050e..4975c03 100644 --- a/src/exoverses/exovista/star.py +++ b/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): diff --git a/src/exoverses/exovista/universe.py b/src/exoverses/exovista/universe.py index 2659d15..d8de5be 100644 --- a/src/exoverses/exovista/universe.py +++ b/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"): diff --git a/src/exoverses/fit/__init__.py b/src/exoverses/fit/__init__.py index 7933f67..9635804 100644 --- a/src/exoverses/fit/__init__.py +++ b/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"] diff --git a/src/exoverses/fit/planet.py b/src/exoverses/fit/planet.py index 5d9e3fa..f50e791 100644 --- a/src/exoverses/fit/planet.py +++ b/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") diff --git a/src/exoverses/util/__init__.py b/src/exoverses/util/__init__.py index f42b9bf..828fbd2 100644 --- a/src/exoverses/util/__init__.py +++ b/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, ) diff --git a/src/exoverses/util/misc.py b/src/exoverses/util/misc.py index 24e7af1..24cb474 100644 --- a/src/exoverses/util/misc.py +++ b/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