Merge pull request #607 from lsst/tickets/DM-32648

DM-32648: Change default branch to main.

.github/workflows/mypy.yaml

@@ -25,7 +25,7 @@ jobs:
         run: pip install types-requests types-PyYAML types-click types-pkg_resources
 
       - name: Install lsst.utils
-        run: pip install git+git://github.com/lsst/utils@master#egg=lsst_utils
+        run: pip install git+git://github.com/lsst/utils@main#egg=lsst_utils
 
       - name: Fake a version
         run: |

doc/lsst.daf.butler/dev/dataCoordinate.rst

@@ -53,7 +53,7 @@ So (prior to DM-24938) we were stuck in an unpleasant tradeoff space when queryi
 
  - or we could do a lot of expensive follow-up queries for `DimensionRecord`\ s we might not need in order to be able to use an ``ExpandedDataCoordinate`` and keep it that information we got for free.
 
-That led to the third version, which right now looks like it will be squashed away in the history of ``DM-24938`` or its subtask-issues and never see the light of the master branch.
+That led to the third version, which right now looks like it will be squashed away in the history of ``DM-24938`` or its subtask-issues and never see the light of the main branch.
 In that version, I made ``DataCoordinate`` a non-mapping ABC that implemented only `__getitem__`, and added intermediate ABCs ``MinimalDataCoordinate`` (mapping with required dimension keys), ``CompleteDataCoordinate`` (mapping with all-dimensions keys), and ``ExpandedDataCoordinate`` (subclass of ``CompleteDataCoordinate`` that adds ``DimensionRecord``\ s for all elements).
 Concrete implementations of each of these were private and constructed only via static or class methods on the public ABCs, and it was all very clean in an OO-heavy, strongly typed sense.
 It was also involved some multiple inheritance (including diamonds) down at the implementation level, but of the sort that still feels okay because the pure ABCs were are the right places in the hierarchy and super() did what you want and if it smelled a little like Java it smelled like _nice_ Java.

python/lsst/daf/butler/registry/databases/postgresql.py

@@ -236,7 +236,7 @@ class comparator_factory(sqlalchemy.types.Concatenable.Comparator):  # noqa: N80
         The existence of this nested class is a workaround for a bug
         submitted upstream as
         https://github.com/sqlalchemy/sqlalchemy/issues/5476 (now fixed on
-        master, but not in the releases we currently use).  The code is
+        main, but not in the releases we currently use).  The code is
         a limited copy of the operators in
         ``sqlalchemy.dialects.postgresql.ranges.RangeOperators``, but with
         ``is_comparison=True`` added to all calls.

requirements.txt

@@ -2,8 +2,8 @@ pyyaml >= 5.1
 astropy >= 4.0
 click >7.0
 sqlalchemy >= 1.3
-git+git://github.com/lsst/sphgeom@master#egg=lsst_sphgeom
-git+git://github.com/lsst/utils@master#egg=lsst_utils
+git+git://github.com/lsst/sphgeom@main#egg=lsst_sphgeom
+git+git://github.com/lsst/utils@main#egg=lsst_utils
 pydantic
 httpx
 

setup.cfg

@@ -23,8 +23,8 @@ install_requires =
   pyyaml >=5.1
   sqlalchemy >= 1.03
   click >= 7.0
-  lsst_sphgeom @ git+https://github.com/lsst/sphgeom@master
-  lsst_utils @ git+https://github.com/lsst/utils@master
+  lsst_sphgeom @ git+https://github.com/lsst/sphgeom@main
+  lsst_utils @ git+https://github.com/lsst/utils@main
   deprecated >= 1.2
 tests_require =
   pytest >= 3.2

tests/data/registry/hsc-rc2-subset.yaml

@@ -15,7 +15,7 @@
 #             ).expanded()
 #         )
 # This requires functionality on branch tickets/DM-24938, which should land
-# on master shortly after this data file does.
+# on main shortly after this data file does.
 #
 # After that export, it was run through the automatic formatter from VSCode's
 # YAML extension (making it compatible with yamllint, which is sadly not true