Merge pull request #21 from lsst-ts/tickets/OPSIM-1106

Move from rubin_sim to rubin_scheduler

Author: tribeiro

conda/meta.yaml

@@ -15,14 +15,14 @@ build:
 test:
   requires:
     - ts-conda-build =0.3
-    - {{ pin_compatible('rubin-sim',  min_pin='x') }}
+    - {{ pin_compatible('rubin-scheduler',  min_pin='x') }}
   source_files:
     - python
     - tests
     - setup.cfg
     - pyproject.toml
   commands:
-    - rs_download_data
+    - scheduler_download_data --update
     - pytest -vsx tests/
 
 requirements:
@@ -32,14 +32,14 @@ requirements:
     - pip
     - setuptools_scm
     - setuptools
-    - rubin-sim =1
+    - rubin-scheduler
   build:
     - python {{ python }}
     - numpy {{ numpy }}
     - setuptools
     - setuptools_scm
     - ts-conda-build
-    - rubin-sim =1
+    - rubin-scheduler
   run:
     - python {{ python }}
-    - {{ pin_compatible('rubin-sim', min_pin='x') }}
+    - {{ pin_compatible('rubin-scheduler', min_pin='x') }}

doc/version_history.rst

@@ -4,6 +4,11 @@
 Version History
 ===============
 
+v0.9.0
+------
+* Move imports from rubin_sim to rubin_scheduler where applicable.
+* Update and extend conda dependencies.
+
 v0.8.0
 ------
 

python/lsst/ts/fbs/utils/auxtel/basis_functions.py

@@ -27,7 +27,7 @@
 
 import typing
 
-from rubin_sim.scheduler import basis_functions
+from rubin_scheduler.scheduler import basis_functions
 
 
 def get_basis_functions_image_survey(

python/lsst/ts/fbs/utils/auxtel/make_scheduler.py

@@ -27,9 +27,9 @@
 
 from astropy import units
 from astropy.coordinates import Angle
-from rubin_sim.scheduler.detailers import BaseDetailer
-from rubin_sim.scheduler.schedulers import CoreScheduler
-from rubin_sim.scheduler.surveys import BaseSurvey
+from rubin_scheduler.scheduler.detailers import BaseDetailer
+from rubin_scheduler.scheduler.schedulers import CoreScheduler
+from rubin_scheduler.scheduler.surveys import BaseSurvey
 
 from .. import AssertSurvey, Target, Tiles, get_auxtel_tiles
 from .surveys import (

python/lsst/ts/fbs/utils/auxtel/surveys.py

@@ -23,9 +23,9 @@
 
 import astropy.units as u
 import numpy as np
-from rubin_sim.scheduler.detailers import BaseDetailer
-from rubin_sim.scheduler.surveys import BaseSurvey, FieldSurvey, GreedySurvey
-from rubin_sim.scheduler.utils import empty_observation
+from rubin_scheduler.scheduler.detailers import BaseDetailer
+from rubin_scheduler.scheduler.surveys import BaseSurvey, FieldSurvey, GreedySurvey
+from rubin_scheduler.scheduler.utils import empty_observation
 
 from ..target import Target
 from .basis_functions import (

python/lsst/ts/fbs/utils/maintel/basis_functions.py

@@ -47,8 +47,8 @@
     "get_basis_functions_anytime_survey",
 ]
 
-from rubin_sim.scheduler import basis_functions
-from rubin_sim.scheduler.utils import standard_goals
+from rubin_scheduler.scheduler import basis_functions
+from rubin_scheduler.scheduler.utils import EuclidOverlapFootprint
 
 
 def get_basis_functions_star_tracker_survey(
@@ -226,7 +226,9 @@ def get_basis_functions_anytime_survey(
     `list`[ `basis_functions.BaseBasisFunction` ]
         List of basis functions.
     """
-    target_map = standard_goals()["r"]
+    sky = EuclidOverlapFootprint()
+    footprints, labels = sky.return_maps()
+    target_map = footprints["r"]
 
     bfs = [
         basis_functions.HaMaskBasisFunction(

python/lsst/ts/fbs/utils/maintel/make_scheduler.py

@@ -47,10 +47,10 @@
 
 from astropy import units
 from astropy.coordinates import Angle
-from rubin_sim.scheduler.detailers import BaseDetailer
-from rubin_sim.scheduler.schedulers import CoreScheduler
-from rubin_sim.scheduler.surveys import BaseSurvey
-from rubin_sim.scheduler.utils import Footprint
+from rubin_scheduler.scheduler.detailers import BaseDetailer
+from rubin_scheduler.scheduler.schedulers import CoreScheduler
+from rubin_scheduler.scheduler.surveys import BaseSurvey
+from rubin_scheduler.scheduler.utils import Footprint
 
 from .. import Target, Tiles, get_maintel_tiles
 from .surveys import (
@@ -119,9 +119,9 @@ def get_scheduler(
                         target=target,
                         wind_speed_maximum=wind_speed_maximum,
                         nfields=len(image_targets),
-                        survey_detailers=survey_detailers
-                        if survey_detailers is not None
-                        else [],
+                        survey_detailers=(
+                            survey_detailers if survey_detailers is not None else []
+                        ),
                     )
                 )
 

python/lsst/ts/fbs/utils/maintel/surveys.py

@@ -44,15 +44,15 @@
 
 import astropy.units as u
 import numpy as np
-from rubin_sim.scheduler.detailers import BaseDetailer
-from rubin_sim.scheduler.surveys import (
+from rubin_scheduler.scheduler.detailers import BaseDetailer
+from rubin_scheduler.scheduler.surveys import (
     BaseSurvey,
     BlobSurvey,
     FieldSurvey,
     GreedySurvey,
 )
-from rubin_sim.scheduler.utils import empty_observation
-from rubin_sim.utils import ddf_locations
+from rubin_scheduler.scheduler.utils import empty_observation
+from rubin_scheduler.utils import ddf_locations
 
 from ..target import Target
 from .basis_functions import (

tests/auxtel/test_scheduler.py

@@ -26,7 +26,7 @@
 from astropy.coordinates import Angle
 from lsst.ts.fbs.utils import Target, Tiles
 from lsst.ts.fbs.utils.auxtel.make_scheduler import MakeScheduler, SurveyType
-from rubin_sim.scheduler.detailers import BaseDetailer, CameraRotDetailer
+from rubin_scheduler.scheduler.detailers import BaseDetailer, CameraRotDetailer
 
 
 class TestMakeScheduler(unittest.TestCase):