Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HLA-1192: GitHub branch rename master to main #1725

Merged
merged 11 commits into from
Feb 15, 2024
Merged

HLA-1192: GitHub branch rename master to main #1725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dda919f
Install the CodeSee workflow. Learn more at https://docs.codesee.io
Dec 4, 2023
8bb6663
Merge branch 'spacetelescope:master' into main
s-goldman Dec 13, 2023
dd9008f
Merge branch 'spacetelescope:master' into main
s-goldman Jan 16, 2024
23d3a62
Merge branch 'spacetelescope:master' into main
s-goldman Jan 29, 2024
b7bd08d
change reference to master in code.
s-goldman Jan 29, 2024
4f66482
Revert "Install the CodeSee workflow. Learn more at https://docs.code…
s-goldman Jan 29, 2024
00133f7
Changelog entry added.
s-goldman Jan 29, 2024
ac136b2
Merge branch 'master' into hla-1192_github_branch_master_to_main_01_2…
s-goldman Jan 30, 2024
6326ccd
Merge branch 'master' into hla-1192_github_branch_master_to_main_01_2…
s-goldman Feb 5, 2024
6574e3d
Merge branch 'master' into hla-1192_github_branch_master_to_main_01_2…
s-goldman Feb 5, 2024
2bd7935
Merge branch 'main' into hla-1192_github_branch_master_to_main_01_29_24
s-goldman Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ number of the code change for that issue. These PRs can be viewed at:

3.6.3 (unreleased)
=====================
- Github branch "master" renamed to main. [#1725]

- Reorganized the readthedocs documentation with the help of various STScI staff. [#1717]

- Added FluxAp1, FluxErrAp1, FluxAp2, and FluxErrAp2 to point sources catalogs
Expand Down
2 changes: 1 addition & 1 deletion drizzlepac/haputils/get_git_rev_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def get_rev_id(local_repo_path):
# Even if installed from a release branch, if there is no git information
# it was installed separate from the source directory, so it is a
# at least a release branch which is comparable to master.
rv = 'master'
rv = 'main'
finally:
os.chdir(start_path)
return(rv)
Expand Down
Loading