diff --git a/schedview/data/sample_opsim.db b/schedview/data/sample_opsim.db index a76e9a3..a1ac8c7 100644 Binary files a/schedview/data/sample_opsim.db and b/schedview/data/sample_opsim.db differ diff --git a/schedview/data/sample_rewards.h5 b/schedview/data/sample_rewards.h5 index 05fd305..3fb9cb0 100644 Binary files a/schedview/data/sample_rewards.h5 and b/schedview/data/sample_rewards.h5 differ diff --git a/schedview/data/sample_scheduler.pickle.xz b/schedview/data/sample_scheduler.pickle.xz index c42abf6..49b97df 100644 Binary files a/schedview/data/sample_scheduler.pickle.xz and b/schedview/data/sample_scheduler.pickle.xz differ diff --git a/tests/test_compute_maf.py b/tests/test_compute_maf.py index 6619a11..d138d75 100644 --- a/tests/test_compute_maf.py +++ b/tests/test_compute_maf.py @@ -1,8 +1,8 @@ import unittest import numpy as np -from rubin_scheduler.data import get_baseline from rubin_scheduler.utils import survey_start_mjd +from rubin_sim.data import get_baseline from schedview.collect import read_opsim diff --git a/tests/test_compute_visits.py b/tests/test_compute_visits.py index a9073bf..1ce2ca9 100644 --- a/tests/test_compute_visits.py +++ b/tests/test_compute_visits.py @@ -2,8 +2,8 @@ import numpy as np from astropy.time import Time -from rubin_scheduler.data import get_baseline from rubin_scheduler.utils import survey_start_mjd +from rubin_sim.data import get_baseline import schedview.collect import schedview.compute.visits diff --git a/tests/test_nightly.py b/tests/test_nightly.py index 501b30c..5f3cd81 100644 --- a/tests/test_nightly.py +++ b/tests/test_nightly.py @@ -3,6 +3,7 @@ from pathlib import Path from tempfile import TemporaryDirectory +import astropy.utils.iers import bokeh import pandas as pd from rubin_scheduler.scheduler.model_observatory import ModelObservatory @@ -34,6 +35,7 @@ def _create_almanac(night): class TestNightly(unittest.TestCase): def test_plot_airmass_vs_time(self): visits = _load_sample_visits() + astropy.utils.iers.conf.iers_degraded_accuracy = "ignore" almanac_events = _create_almanac(visits["start_date"].dt.date[0]) fig = schedview.plot.nightly.plot_airmass_vs_time(visits, almanac_events) diff --git a/tests/test_overhead.py b/tests/test_overhead.py index be2dac8..265a8ca 100644 --- a/tests/test_overhead.py +++ b/tests/test_overhead.py @@ -2,8 +2,8 @@ import bokeh from astropy.time import Time -from rubin_scheduler.data import get_baseline from rubin_scheduler.utils import survey_start_mjd +from rubin_sim.data import get_baseline import schedview.collect import schedview.compute.visits diff --git a/tests/test_plot_cadence.py b/tests/test_plot_cadence.py index 3148ec8..9f18344 100644 --- a/tests/test_plot_cadence.py +++ b/tests/test_plot_cadence.py @@ -3,7 +3,7 @@ import bokeh.models.layouts import numpy as np -from rubin_scheduler.data import get_baseline +from rubin_sim.data import get_baseline import schedview.collect import schedview.compute.visits diff --git a/tests/test_plot_survey.py b/tests/test_plot_survey.py index 7e17db0..cce69dd 100644 --- a/tests/test_plot_survey.py +++ b/tests/test_plot_survey.py @@ -4,9 +4,9 @@ import healpy as hp import numpy as np from astropy.time import Time -from rubin_scheduler.data import get_baseline from rubin_scheduler.scheduler.model_observatory import ModelObservatory from rubin_scheduler.utils import survey_start_mjd +from rubin_sim.data import get_baseline from uranography.api import SphereMap import schedview.collect diff --git a/tests/test_plot_visits.py b/tests/test_plot_visits.py index 4614b1d..e724497 100644 --- a/tests/test_plot_visits.py +++ b/tests/test_plot_visits.py @@ -2,8 +2,8 @@ import bokeh from astropy.time import Time -from rubin_scheduler.data import get_baseline from rubin_scheduler.utils import survey_start_mjd +from rubin_sim.data import get_baseline import schedview.collect import schedview.plot diff --git a/tests/test_resources.py b/tests/test_resources.py index 3b65b73..a47e957 100644 --- a/tests/test_resources.py +++ b/tests/test_resources.py @@ -5,7 +5,7 @@ import pandas as pd from astropy.time import Time from lsst.resources import ResourcePath -from rubin_scheduler.data import get_baseline +from rubin_sim.data import get_baseline from schedview.collect.opsim import read_ddf_visits, read_opsim from schedview.collect.resources import find_file_resources