Merge pull request #457 from lsst/tickets/SP-2104

SP-2104: update dependency requirements

Author: rhiannonlynne

.github/workflows/test_and_build.yaml

@@ -36,6 +36,7 @@ jobs:
         shell: bash -l {0}
         run: |
           conda install --yes --file=requirements.txt
+          conda install --yes --file=optional-requirements.txt
           conda install --yes --file=test-requirements.txt
 
       - name: install rubin_sim

optional-requirements.txt

@@ -1,2 +1,6 @@
 openorb
 openorb-data-de405
+george
+scikit-learn
+jinja2
+tornado

pyproject.toml

@@ -19,28 +19,26 @@ classifiers = [
 urls = {documentation = "https://rubin-sim.lsst.io", repository = "https://github.com/lsst/rubin_sim" }
 dynamic = [ "version" ]
 dependencies = [
-    "numpy",
-    "matplotlib",
-    "healpy",
-    "pandas",
-    "numexpr",
-    "scipy",
-    "sqlalchemy",
-    "astropy",
-    "tables",
-    "h5py",
     "astroplan",
+    "astropy",
     "colorcet",
     "cycler",
-    "george",
-    "scikit-learn",
+    "gitpython",
+    "h5py",
+    "healpy",
+    "matplotlib",
+    "numexpr",
+    "numpy",
+    "pandas",
+    "pyarrow",
+    "rubin-scheduler>=3.0",
+    "scipy",
     "shapely",
-    "skyfield",
+    "skyfield>=1.52",
     "skyproj",
-    "tqdm",
-    "rubin-scheduler>=3.0",
-    "pyarrow",
-    "gitpython",
+    "sqlalchemy",
+    "tables",
+    "tqdm"
 ]
 
 [project.optional-dependencies]
@@ -54,6 +52,11 @@ test = [
 dev = [
   "documenteer[guide]",
 ]
+extras = [
+    "george",
+    "scikit-learn",
+    "pyoorb",
+]
 
 [project.scripts]
 rs_download_data = "rubin_sim.data.rs_download_data:rs_download_data"
@@ -85,7 +88,7 @@ version = { attr = "setuptools_scm.get_version" }
 where = [ "" ]
 
 [tool.setuptools_scm]
-version_file = "rubin_sim/_version.py"
+version_file = "rubin_sim/version.py"
 
 
 [tool.pytest.ini_options]
@@ -98,7 +101,7 @@ exclude = "version.py"
 
 [tool.black]
 line-length = 110
-target-version = ["py311"]
+target-version = ["py312"]
 
 [tool.isort]
 profile = "black"
@@ -109,7 +112,7 @@ exclude = [
     "__init__.py",
 ]
 line-length = 110
-target-version = "py311"
+target-version = "py312"
 
 [tool.ruff.lint]
 ignore = [

requirements.txt

@@ -1,27 +1,23 @@
-setuptools_scm
-setuptools_scm_git_archive
-numpy
-matplotlib
+astropy-base
+astroplan
+colorcet
+conda
+cycler
+gitpython
 healpy
+h5py
+matplotlib-base
+numpy
+numexpr
 pandas
 pyarrow
-numexpr
-scipy
-sqlalchemy
-astropy
 pytables
-h5py
-astroplan
-colorcet
-cycler
-george
-scikit-learn
+rubin-scheduler >=3.0
+scipy
+setuptools_scm
+setuptools_scm_git_archive
 shapely
-skyfield
+skyfield >=1.52
 skyproj
-tornado
-jinja2
+sqlalchemy
 tqdm
-gitpython
-conda
-rubin-scheduler >=3.0

rubin_sim/maf/maf_contrib/static_probes_fom_summary_metric.py

@@ -4,7 +4,6 @@
 import numpy as np
 import pandas as pd
 from scipy.optimize import minimize
-from sklearn.preprocessing import StandardScaler
 
 from rubin_sim.maf.metrics.base_metric import BaseMetric
 
@@ -326,6 +325,7 @@ def __init__(
     def run(self, data_slice, slice_point=None):
         import george
         from george import kernels
+        from sklearn.preprocessing import StandardScaler
 
         # Chop off any outliers
         good_pix = np.where(data_slice[self.col] > 0)[0]