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

Master to main #1669

Merged
merged 4 commits into from
Feb 27, 2024
Merged

Master to main #1669

merged 4 commits into from
Feb 27, 2024

Conversation

Zeitsperre
Copy link
Collaborator

@Zeitsperre Zeitsperre commented Feb 26, 2024

Pull Request Checklist:

  • This PR addresses an already opened issue (for bug fixes / features)
  • Tests for the changes have been added (for bug fixes / features)
    • (If applicable) Documentation has been added / updated (for bug fixes / features)
  • CHANGES.rst has been updated (with summary of main changes)
    • Link to issue (:issue:number) and pull request (:pull:number) has been added

What kind of change does this PR introduce?

  • Renames all references of xclim@master to xclim@main
  • The sphinx field for master_doc has been renamed to root_doc

Does this PR introduce a breaking change?

Yes. The master branch has been renamed to main. Existing Pull Requests and branches will need to adapt to this change. Local clones of xclim will need to be adapted to these changes.

Other information:

This is not to be merged until after we release v0.48.2.

Changing your master branch name to main locally: https://stackoverflow.com/a/71951106/7322852

@Zeitsperre Zeitsperre added standards / conventions Suggestions on ways forward information For development/intsructional purposes labels Feb 26, 2024
@Zeitsperre Zeitsperre added this to the v0.49.0 (PyCon LT) milestone Feb 26, 2024
@Zeitsperre Zeitsperre self-assigned this Feb 26, 2024
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@github-actions github-actions bot added CI Automation and Contiunous Integration docs Improvements to documenation labels Feb 26, 2024
Copy link

Note
It appears that this Pull Request modifies the main.yml workflow.

On inspection, the XCLIM_TESTDATA_BRANCH environment variable is set to the most recent tag (v2023.12.14).

No further action is required.

Base automatically changed from prepare-v0482 to master February 26, 2024 16:41
@Zeitsperre Zeitsperre requested a review from a team February 26, 2024 20:22
@Zeitsperre Zeitsperre marked this pull request as ready for review February 26, 2024 20:22
@coxipi
Copy link
Contributor

coxipi commented Feb 26, 2024

In docs > conf.py, there is a variable master_doc = "index". Not that it matters, but should we change this for main_doc for consistency, or it's unrelated? Other than that, I didn't find remaining mentions of master that should be changed in xclim code.

@Zeitsperre
Copy link
Collaborator Author

In docs > conf.py, there is a variable master_doc = "index". Not that it matters, but should we change this for main_doc for consistency, or it's unrelated? Other than that, I didn't find remaining mentions of master that should be changed in xclim code.

Good catch. I didn't bother changing this since I figured that this was a sphinx target (and it is). Luckily, it also seems like the Sphinx developers have migrated away from this nomenclature as well. Will update this field now.

@github-actions github-actions bot added the approved Approved for additional tests label Feb 27, 2024
@coveralls
Copy link

Coverage Status

coverage: 90.193%. remained the same
when pulling 0a2a126 on master-to-main
into fc998c6 on master.

@Zeitsperre Zeitsperre merged commit d5704fb into master Feb 27, 2024
28 checks passed
@Zeitsperre Zeitsperre deleted the master-to-main branch February 27, 2024 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Approved for additional tests CI Automation and Contiunous Integration docs Improvements to documenation information For development/intsructional purposes standards / conventions Suggestions on ways forward
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rename the master branch to main
4 participants