LSSTDESC · erykoff · Mar 30, 2024 · Apr 4, 2024 · Apr 7, 2024 · Apr 7, 2024
diff --git a/.github/workflows/python-package-pr.yml b/.github/workflows/python-package-pr.yml
@@ -20,14 +20,14 @@ jobs:
       with:
         fetch-depth: 0
 
-    - uses: conda-incubator/setup-miniconda@v2
+    - uses: conda-incubator/setup-miniconda@v3
       with:
         python-version: ${{ matrix.python-version }}
         channels: conda-forge,defaults
         channel-priority: strict
         show-channel-urls: true
         miniforge-version: latest
-        miniforge-variant: Mambaforge
+        use-mamba: true
 
     - name: Configure conda and install code
       shell: bash -l {0}

diff --git a/.github/workflows/python-package-push.yml b/.github/workflows/python-package-push.yml
@@ -15,14 +15,14 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - uses: conda-incubator/setup-miniconda@v2
+    - uses: conda-incubator/setup-miniconda@v3
       with:
         python-version: ${{ matrix.python-version }}
         channels: conda-forge,defaults
         channel-priority: strict
         show-channel-urls: true
         miniforge-version: latest
-        miniforge-variant: Mambaforge
+        use-mamba: true
 
     - name: Configure conda and install code
       shell: bash -l {0}

diff --git a/docs/basic_interface.rst b/docs/basic_interface.rst
@@ -129,7 +129,7 @@ The default is to plot a thick line along the Galactic equator, and two dashed l
     fig, ax = plt.subplots(figsize=(8, 5))
     sp = skyproj.McBrydeSkyproj(ax=ax)
     sp.draw_milky_way(label='Milky Way')
-    sp.legend()
+    sp.legend(loc="upper right")
     plt.show()
 
 .. image:: images/milky_way.png
@@ -148,7 +148,7 @@ When using :code:`draw_milky_way()`, it will plot in Galactic coordinates.
     fig, ax = plt.subplots(figsize=(8, 5))
     sp = skyproj.McBrydeSkyproj(ax=ax, galactic=True, longitude_ticks='symmetric')
     sp.draw_milky_way(label='Milky Way')
-    sp.legend()
+    sp.legend(loc="upper right")
     plt.show()
 
 .. image:: images/milky_way_galactic.png
@@ -238,28 +238,36 @@ Plotting Customization
 
 Much of the plotting functionality is decided by `SkyProj` itself.
 However, there is a lot of customization available.
-The fonts, font sizes, tick label sizes, etc, are all determined by the :code:`matplotlib` RC parameter dictionary.
-A few of these in particular should be highlighted:
+With `SkyProj` version 2 the customization is easier than ever.
+
+Most fonts, font sizes, tick label sizes, etc, are set with the usual :code:`matplotlib` interface.
+For example, you can set the tick label sizes and colors with :code:`sp.ax.tick_params(axis="x", labelsize=20, labelcolor="green")`.
+The axis label sizes and colors can be set with :code:`sp.ax.set_xlabel("New X Label", fontsize=10, fontcolor="red")`.
+
+Additional plot parameters are controlled via the :code:`matplotlib` RC parameter dictionary.
+In particular:
 
-* :code:`xticks.labelsize`: Sets the label size for the x (longitude) ticks on the plot.
-* :code:`yticks.labelsize`: Sets the label size for the y (latitude) ticks on the plot.
 * :code:`axes.linewidth`: Sets the width of the boundary of the full plot.
-* :code:`axes.labelsize`: Sets the size of the x/y (lon/lat) labels; this will default to 16 unless specifically overridden with an :code:`rcparams`.
 
-These values (and any others) can be overridden at the time of map instantiation with a temporary dictionary, like so:
+To override values, we recommend using a matplotlib RC context, like the following.
+Note that the internal use of the `rc_params` (from `SkyProj` version 1) has been deprecated and is no longer used.
 
 .. code-block :: python
 
     import matplotlib.pyplot as plt
     import skyproj
 
     # These values are comically exaggerated for effect.
-    rcparams = {'xtick.labelsize': 20,
-                'ytick.labelsize': 4,
-                'axes.linewidth': 5}
+    rcparams = {'axes.linewidth': 5}
+
+    with plt.rc_context(rcparams)
+        fig, ax = plt.subplots(figsize=(8, 5))
+        sp = skyproj.McBrydeSkyproj(ax=ax)
+
+    sp.ax.tick_params(axis="x", labelsize=20, labelcolor="green")
+    sp.ax.tick_params(axis="y", labelsize=4, labelcolor="blue")
+    sp.ax.set_xlabel("New X Label", fontsize=10, color="red")
 
-    fig, ax = plt.subplots(figsize=(8, 5))
-    sp = skyproj.McBrydeSkyproj(ax=ax, rcparams=rcparams)
     plt.show()
 
 .. image:: images/skyproj_full_override_sizes.png

diff --git a/docs/images/AlbersSkyproj_with_indicatrix.png b/docs/images/AlbersSkyproj_with_indicatrix.png
diff --git a/docs/images/BLISS_survey.png b/docs/images/BLISS_survey.png
diff --git a/docs/images/DECaLS_survey.png b/docs/images/DECaLS_survey.png
diff --git a/docs/images/DESAlbers_survey_with_indicatrices.png b/docs/images/DESAlbers_survey_with_indicatrices.png
diff --git a/docs/images/DES_survey.png b/docs/images/DES_survey.png
diff --git a/docs/images/DES_survey_with_indicatrices.png b/docs/images/DES_survey_with_indicatrices.png
diff --git a/docs/images/EqualEarthSkyproj_with_indicatrices.png b/docs/images/EqualEarthSkyproj_with_indicatrices.png
diff --git a/docs/images/GnomonicSkyproj_with_indicatrix.png b/docs/images/GnomonicSkyproj_with_indicatrix.png
diff --git a/docs/images/HammerSkyproj_with_indicatrices.png b/docs/images/HammerSkyproj_with_indicatrices.png
diff --git a/docs/images/LaeaSkyproj_with_indicatrices.png b/docs/images/LaeaSkyproj_with_indicatrices.png
diff --git a/docs/images/MagLiTeS_survey.png b/docs/images/MagLiTeS_survey.png
diff --git a/docs/images/McBrydeSkyproj_with_indicatrices.png b/docs/images/McBrydeSkyproj_with_indicatrices.png
diff --git a/docs/images/MollweideSkyproj_with_indicatrices.png b/docs/images/MollweideSkyproj_with_indicatrices.png
diff --git a/docs/images/ObliqueMollweideSkyproj.png b/docs/images/ObliqueMollweideSkyproj.png
diff --git a/docs/images/Skyproj_with_indicatrices.png b/docs/images/Skyproj_with_indicatrices.png
diff --git a/docs/images/healsparse_one.png b/docs/images/healsparse_one.png
diff --git a/docs/images/healsparse_two.png b/docs/images/healsparse_two.png
diff --git a/docs/images/healsparse_valid_pixels.png b/docs/images/healsparse_valid_pixels.png
diff --git a/docs/images/hpxbin.png b/docs/images/hpxbin.png
diff --git a/docs/images/hpxbin_reproject.png b/docs/images/hpxbin_reproject.png
diff --git a/docs/images/lines_and_polygons_0.0.png b/docs/images/lines_and_polygons_0.0.png
diff --git a/docs/images/milky_way.png b/docs/images/milky_way.png
diff --git a/docs/images/milky_way_galactic.png b/docs/images/milky_way_galactic.png
diff --git a/docs/images/skyproj_full_override_sizes.png b/docs/images/skyproj_full_override_sizes.png
diff --git a/pyproject.toml b/pyproject.toml
@@ -54,5 +54,4 @@ exclude = [
   "docs/conf.py",
   "docs/_build/html/conf.py",
   "build",
-  "vendor/mpl_toolkit_functions.py",
 ]
diff --git a/skyproj/__init__.py b/skyproj/__init__.py
@@ -8,3 +8,4 @@
 from .transforms import *
 from .skyaxes import *
 from .survey import *
+from .skygrid import *
diff --git a/skyproj/_docstrings.py b/skyproj/_docstrings.py
@@ -43,9 +43,9 @@ def skyproj_init_parameters(intro_string, include_projection_name=False, include
     Plotting in Galactic coordinates?  Recommendation for Galactic plots
     is to have longitude_ticks set to ``symmetric`` and celestial = True.
 rcparams : `dict`, optional
-    Dictionary of matplotlib rc parameters to override.  In particular, the code will
-    use ``xtick.labelsize`` and ``ytick.labelsize`` for the x and y tick labels, and
-    ``axes.linewidth`` for the map boundary.
+    Deprecated; do not use. To set ``xtick.labelsize`` please use
+    ``SkyProj.ax.tick_params()``. To set the map boundary width,
+    please set ``matplotlib.rcParams["axes.linewidth"]`` directly.
 n_grid_lon : `int`, optional
     Number of gridlines to use in the longitude direction
     (default is axis_ratio * n_grid_lat).
@@ -67,7 +67,8 @@ def skyproj_init_parameters(intro_string, include_projection_name=False, include
 
 draw_map_common_pars = """
 zoom : `bool`, optional
-    Optimally zoom in projection to computed map.
+    Optimally zoom in projection to computed map. This will override
+    lon_range/lat_range if these are larger than the map.
 xsize : `int`, optional
     Number of rasterized pixels in the x direction.
 vmin : `float`, optional
@@ -77,9 +78,13 @@ def skyproj_init_parameters(intro_string, include_projection_name=False, include
 rasterized : `bool`, optional
     Plot with rasterized graphics.
 lon_range : `tuple` [`float`, `float`], optional
-    Longitude range to plot [``lon_min``, ``lon_max``].
+    Longitude range to plot [``lon_min``, ``lon_max``]. Map will
+    be truncated to this range prior to computing optimal zoom
+    (if zoom is ``True``).
 lat_range : `tuple` [`float`, `float`], optional
-    Latitude range to plot [``lat_min``, ``lat_max``].
+    Latitude range to plot [``lat_min``, ``lat_max``]. Map will
+    be truncated to this range prior to computing optimal zoom
+    (if zoom is ``True``).
 norm : `str` or `matplotlib.colors.Normalize`, optional
     The normalization method used to scale the data. By default a
     linear scaling is used. This may be an instance of `Normalize` or