Resolve merge conflicts

.gitattributes

@@ -1,7 +1,7 @@
 # For explanation of this file and uses see
 # https://git-scm.com/docs/gitattributes
 # https://developer.lsst.io/git/git-lfs.html#using-git-lfs-enabled-repositories
-# https://lincc-ppt.readthedocs.io/en/latest/practices/git-lfs.html
+# https://lincc-ppt.readthedocs.io/en/stable/practices/git-lfs.html
 #
 # Used by https://github.com/lsst/afwdata.git
 # *.boost filter=lfs diff=lfs merge=lfs -text

.github/workflows/pre-commit-ci.yml

@@ -1,6 +1,6 @@
 # This workflow runs pre-commit hooks on pushes and pull requests to main
 # to enforce coding style. To ensure correct configuration, please refer to:
-#  https://lincc-ppt.readthedocs.io/en/latest/practices/ci_precommit.html
+#  https://lincc-ppt.readthedocs.io/en/stable/practices/ci_precommit.html
 name: Run pre-commit hooks
 
 on:

.github/workflows/smoke-test.yml

@@ -1,7 +1,7 @@
 # This workflow will run daily at 06:45.
 # It will install Python dependencies and run tests with a variety of Python versions.
 # See documentation for help debugging smoke test issues:
-#    https://lincc-ppt.readthedocs.io/en/latest/practices/ci_testing.html#version-culprit
+#    https://lincc-ppt.readthedocs.io/en/stable/practices/ci_testing.html#version-culprit
 
 name: Unit test smoke test
 

README.md

@@ -3,7 +3,7 @@
 
 # LSDB
 
-[![Template](https://img.shields.io/badge/Template-LINCC%20Frameworks%20Python%20Project%20Template-brightgreen)](https://lincc-ppt.readthedocs.io/en/latest/)
+[![Template](https://img.shields.io/badge/Template-LINCC%20Frameworks%20Python%20Project%20Template-brightgreen)](https://lincc-ppt.readthedocs.io/en/stable/)
 
 [![PyPI](https://img.shields.io/pypi/v/lsdb?color=blue&logo=pypi&logoColor=white)](https://pypi.org/project/lsdb/)
 [![Conda](https://img.shields.io/conda/vn/conda-forge/lsdb.svg?color=blue&logo=condaforge&logoColor=white)](https://anaconda.org/conda-forge/lsdb) 
@@ -19,21 +19,21 @@ A framework to facilitate and enable spatial analysis for extremely large astron
 (i.e. querying and crossmatching O(1B) sources). This package uses dask to parallelize operations across
 multiple HiPSCat partitioned surveys.
 
-Check out our [ReadTheDocs site](https://lsdb.readthedocs.io/en/latest/)
+Check out our [ReadTheDocs site](https://lsdb.readthedocs.io/en/stable/)
 for more information on partitioning, installation, and contributing.
 
 See related projects:
 
 * HiPSCat ([on GitHub](https://github.com/astronomy-commons/hipscat))
-  ([on ReadTheDocs](https://hipscat.readthedocs.io/en/latest/))
+  ([on ReadTheDocs](https://hipscat.readthedocs.io/en/stable/))
 * HiPSCat Import ([on GitHub](https://github.com/astronomy-commons/hipscat-import))
-  ([on ReadTheDocs](https://hipscat-import.readthedocs.io/en/latest/))
+  ([on ReadTheDocs](https://hipscat-import.readthedocs.io/en/stable/))
 
 ## Contributing
 
 [![GitHub issue custom search in repo](https://img.shields.io/github/issues-search/astronomy-commons/lsdb?color=purple&label=Good%20first%20issues&query=is%3Aopen%20label%3A%22good%20first%20issue%22)](https://github.com/astronomy-commons/lsdb/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
 
-See the [contribution guide](https://lsdb.readthedocs.io/en/latest/developer/contributing.html)
+See the [contribution guide](https://lsdb.readthedocs.io/en/stable/developer/contributing.html)
 for complete installation instructions and contribution best practices.
 
 ## Acknowledgements

docs/developer/contributing.rst

@@ -31,8 +31,8 @@ Notes:
 2) ``pre-commit install`` will initialize pre-commit for this local repository, so
    that a set of tests will be run prior to completing a local commit. For more
    information, see the Python Project Template documentation on
-   `pre-commit <https://lincc-ppt.readthedocs.io/en/latest/practices/precommit.html>`_.
+   `pre-commit <https://lincc-ppt.readthedocs.io/en/stable/practices/precommit.html>`_.
 3) Installing ``pandoc`` allows you to verify that automatic rendering of Jupyter notebooks
    into documentation for ReadTheDocs works as expected. For more information, see
    the Python Project Template documentation on
-   `Sphinx and Python Notebooks <https://lincc-ppt.readthedocs.io/en/latest/practices/sphinx.html#python-notebooks>`_.
+   `Sphinx and Python Notebooks <https://lincc-ppt.readthedocs.io/en/stable/practices/sphinx.html#python-notebooks>`_.

docs/index.rst

@@ -10,7 +10,7 @@ LSDB is a framework that facilitates and enables fast spatial analysis for extre
 particular those brought up by `LSST <https://www.lsst.org/about>`_.
 
 Built on top of Dask to efficiently scale and parallelize operations across multiple workers, it leverages
-the `HiPSCat <https://hipscat.readthedocs.io/en/latest/>`_ data format for surveys in a partitioned HEALPix
+the `HiPSCat <https://hipscat.readthedocs.io/en/stable/>`_ data format for surveys in a partitioned HEALPix
 (Hierarchical Equal Area isoLatitude Pixelization) structure.
 
 .. figure:: _static/gaia.png

tests/lsdb/catalog/test_polygon_search.py

@@ -64,7 +64,7 @@ def test_polygon_search_empty(small_sky_order1_catalog):
     vertices = [(0, 0), (1, 1), (0, 2)]
     polygon_search_catalog = small_sky_order1_catalog.polygon_search(vertices)
     assert len(polygon_search_catalog.get_healpix_pixels()) == 0
-    assert len(polygon_search_catalog.hc_structure.pixel_tree) == 1
+    assert len(polygon_search_catalog.hc_structure.pixel_tree) == 0
 
 
 def test_polygon_search_coarse_versus_fine(small_sky_order1_catalog):

tests/lsdb/loaders/dataframe/test_from_dataframe.py

@@ -6,7 +6,6 @@
 from hipscat.catalog import CatalogType
 from hipscat.pixel_math.healpix_pixel_function import get_pixel_argsort
 from hipscat.pixel_math.hipscat_id import HIPSCAT_ID_COLUMN
-from hipscat.pixel_tree.pixel_node_type import PixelNodeType
 
 import lsdb
 from lsdb.catalog.margin_catalog import MarginCatalog
@@ -99,8 +98,7 @@ def test_partitions_on_map_match_pixel_tree(small_sky_order1_df, small_sky_order
     kwargs = get_catalog_kwargs(small_sky_order1_catalog)
     catalog = lsdb.from_dataframe(small_sky_order1_df, margin_threshold=None, **kwargs)
     for hp_pixel, _ in catalog._ddf_pixel_map.items():
-        if hp_pixel in catalog.hc_structure.pixel_tree:
-            assert catalog.hc_structure.pixel_tree[hp_pixel].node_type == PixelNodeType.LEAF
+        assert hp_pixel in catalog.hc_structure.pixel_tree
 
 
 def test_from_dataframe_with_non_default_ra_dec_columns(small_sky_order1_df, small_sky_order1_catalog):