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.

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

chore: Update references to default branch to 'main' #2019

Merged
merged 3 commits into from
Sep 22, 2022

Conversation

matthewfeickert
Copy link
Member

@matthewfeickert matthewfeickert commented Sep 21, 2022

Description

Join most of the rest of Scikit-HEP and use 'main' as the default branch. This has already been done in GitHub's settings, but this updates all reference to the default branch from 'master' to 'main'. The remaining instances of 'master' in the repo are the following which are fine to keep:

$ git grep "master"
docs/conf.py:# The master toctree document.
docs/conf.py:master_doc = 'index'
docs/conf.py:        master_doc,
docs/conf.py:man_pages = [(master_doc, 'pyhf', 'pyhf Documentation', [author], 1)]
docs/conf.py:        master_doc,
docs/conf.py:# c.f. https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-the-linkcheck-builder
docs/index.rst:.. pyhf documentation master file, created by

We should probably keep the master branch around for a year and occasionally sync it to main just so anyone who relies on master can transition away from it, but we can probably safely delete master from our local machines.

Checklist Before Requesting Reviewer

  • Tests are passing
  • "WIP" removed from the title of the pull request
  • Selected an Assignee for the PR to be responsible for the log summary

Before Merging

For the PR Assignees:

  • Summarize commit messages into a comprehensive review of the PR
* Update all references to the default repository branch from 'master' to 'main'.

@matthewfeickert matthewfeickert added docs Documentation related chore Other changes that don't modify src or test files labels Sep 21, 2022
@matthewfeickert matthewfeickert self-assigned this Sep 21, 2022
@matthewfeickert matthewfeickert changed the title chore: Update referenced to default branch to 'main' chore: Update references to default branch to 'main' Sep 21, 2022
@codecov
Copy link

codecov bot commented Sep 21, 2022

Codecov Report

Base: 98.29% // Head: 98.29% // No change to project coverage 👍

Coverage data is based on head (aea7dda) compared to base (37abb3b).
Patch has no changes to coverable lines.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2019   +/-   ##
=======================================
  Coverage   98.29%   98.29%           
=======================================
  Files          69       69           
  Lines        4529     4529           
  Branches      738      738           
=======================================
  Hits         4452     4452           
  Misses         45       45           
  Partials       32       32           
Flag Coverage Δ
contrib 27.51% <ø> (ø)
doctest 61.13% <ø> (ø)
unittests-3.10 96.31% <ø> (ø)
unittests-3.7 96.28% <ø> (ø)
unittests-3.8 96.33% <ø> (ø)
unittests-3.9 96.35% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
src/pyhf/cli/infer.py 97.61% <ø> (ø)
src/pyhf/cli/spec.py 100.00% <ø> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@matthewfeickert
Copy link
Member Author

Relevant RTD build: https://pyhf--2019.org.readthedocs.build/en/2019/

@matthewfeickert
Copy link
Member Author

As this affects the CI workflows this needs to go in next before any other PRs.

@matthewfeickert matthewfeickert added the CI CI systems, GitHub Actions label Sep 22, 2022
@kratsg
Copy link
Contributor

kratsg commented Sep 22, 2022

We should probably keep the master branch around for a year and occasionally sync it to main just so anyone who relies on master can transition away from it, but we can probably safely delete master from our local machines.

Just delete it entirely. Nobody's going to be relying on master explicitly unless it's a default thing.

@matthewfeickert matthewfeickert merged commit de416d5 into main Sep 22, 2022
@matthewfeickert matthewfeickert deleted the chore/switch-default-branch-to-main branch September 22, 2022 14:05
@matthewfeickert
Copy link
Member Author

Just delete it entirely. Nobody's going to be relying on master explicitly unless it's a default thing.

Okay. Just deleted master. 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Other changes that don't modify src or test files CI CI systems, GitHub Actions docs Documentation related
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants