Skip to content

Commit

Permalink
Merge pull request #93 from lsst/tickets/DM-32648
Browse files Browse the repository at this point in the history
DM-32648: Change default branch to main.
  • Loading branch information
ktlim committed Nov 28, 2021
2 parents 85b300b + 7fb9adb commit 54d448b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion python/lsst/verify/bin/dispatchverify.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
- ``PRODUCT``: the name of the product built, e.g. 'validate_drp'
- ``dataset``: the name of the dataset processed, e.g. 'validation_data_cfht'
- ``label``: the name of the platform where it runs
- ``refs``: the branches run by Jenkins, e.g. 'tickets/DM-12345 master'
- ``refs``: the branches run by Jenkins, e.g. 'tickets/DM-12345 main'
If ``--lsstsw`` is used, additional Git branch information is included with
Science Pipelines package metadata.
Expand Down
2 changes: 1 addition & 1 deletion tests/data/lsstsw/etc/repos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# how it may be cloned. Key names must conform to the EUPS product name of the
# source package. Values may be either a URL (string) or a dict/hash/map with
# a `url` key and *at least* one `ref` or `lfs`. The `ref` key generally
# should be used only if a ref /other than/ `master` is desired. The `lfs`
# should be used only if a ref /other than/ `main` is desired. The `lfs`
# key is used to identicate that the repo is using git-lfs.
#
# * `url`: string - URL of git repo
Expand Down
6 changes: 3 additions & 3 deletions tests/test_lsstsw.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ def test_lsstsw_repos(self):
# @unittest.skipIf(mock is None, 'unittest.mock is required.')
# def test_get_package_branch(self, MockRepo):
# # mock git.Repo in lsst.verify.provsrc.lsstsw so that a repo's active
# # branch is master and doesn't attempt to actually query the repo in
# # branch is main and doesn't attempt to actually query the repo in
# # the filesystem.
# # mock.mocker.patch('lsstsw.verify.provsrc.lsstsw.git.Repo')
# MockRepo.return_value.active_branch.name = 'master'
# MockRepo.return_value.active_branch.name = 'main'

# lsstsw_repos = lsstsw.LsstswRepos(self.lsstsw_dirname)
# self.assertEqual(
# lsstsw_repos.get_package_branch('afw'),
# 'master')
# 'main')


if __name__ == "__main__":
Expand Down

0 comments on commit 54d448b

Please sign in to comment.