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

Update references to master to point to main #3351

Merged
merged 5 commits into from Sep 7, 2021
Merged

Conversation

jni
Copy link
Member

@jni jni commented Sep 7, 2021

Description

Closes #3128.

The repo's default branch is already main, but now we need to clean up all the references in the code and docs that point to master instead of main.

@jni
Copy link
Member Author

jni commented Sep 7, 2021

Note: I have not updated the default branch on the napari/docs repo because I got the following scary message:

Screen Shot 2021-09-07 at 12 09 46 pm

ie we'd need to trigger a push ~simultaneously in order to not break the API docs. Since these are automatically generated and not user-facing, I propose we postpone that specific transition.

@codecov
Copy link

codecov bot commented Sep 7, 2021

Codecov Report

Merging #3351 (4fa954a) into main (5f96d5d) will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #3351      +/-   ##
==========================================
+ Coverage   82.55%   82.56%   +0.01%     
==========================================
  Files         542      542              
  Lines       45147    45147              
==========================================
+ Hits        37269    37275       +6     
+ Misses       7878     7872       -6     
Impacted Files Coverage Δ
napari/_vispy/vispy_surface_layer.py 86.20% <ø> (ø)
napari/benchmarks/benchmark_image_layer.py 0.00% <ø> (ø)
napari/benchmarks/benchmark_labels_layer.py 0.00% <ø> (ø)
napari/benchmarks/benchmark_points_layer.py 0.00% <ø> (ø)
napari/benchmarks/benchmark_qt_viewer.py 0.00% <ø> (ø)
napari/benchmarks/benchmark_qt_viewer_image.py 0.00% <ø> (ø)
napari/benchmarks/benchmark_qt_viewer_labels.py 0.00% <ø> (ø)
napari/benchmarks/benchmark_shapes_layer.py 0.00% <ø> (ø)
napari/benchmarks/benchmark_surface_layer.py 0.00% <ø> (ø)
napari/benchmarks/benchmark_vectors_layer.py 0.00% <ø> (ø)
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5f96d5d...4fa954a. Read the comment docs.

@tlambert03
Copy link
Member

merging so that we can have tests again. can follow up if we find additional stuff

@tlambert03 tlambert03 merged commit b233a83 into napari:main Sep 7, 2021
@jni jni deleted the master-main branch September 8, 2021 00:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Switch "master" to "main"
2 participants