chore: move to main branch

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
gershnik · Feb 23, 2023 · 7e9753c · 7e9753c
1 parent 1fd4f0d
commit 7e9753c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,7 +4,6 @@ on:
   pull_request:
   push:
     branches:
-    - master
     - main
 
 concurrency:

diff --git a/README.rst b/README.rst
@@ -5,10 +5,10 @@ scikit-build
 .. image:: https://github.com/scikit-build/scikit-build/actions/workflows/ci.yml/badge.svg
     :target: https://github.com/scikit-build/scikit-build/actions/workflows/ci.yml
 
-.. image:: https://dev.azure.com/scikit-build/scikit-build/_apis/build/status/scikit-build.scikit-build?branchName=master
-   :target: https://dev.azure.com/scikit-build/scikit-build/_build/latest?definitionId=1&branchName=master
+.. image:: https://dev.azure.com/scikit-build/scikit-build/_apis/build/status/scikit-build.scikit-build?branchName=main
+   :target: https://dev.azure.com/scikit-build/scikit-build/_build/latest?definitionId=1&branchName=main
 
-.. image:: https://codecov.io/gh/scikit-build/scikit-build/branch/master/graph/badge.svg
+.. image:: https://codecov.io/gh/scikit-build/scikit-build/branch/main/graph/badge.svg
     :target: https://codecov.io/gh/scikit-build/scikit-build
     :alt: Code coverage status
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,5 +1,5 @@
 trigger:
-  - master
+  - main
 
 jobs:
   - job: Windows

diff --git a/docs/make_a_release.rst b/docs/make_a_release.rst
@@ -105,20 +105,20 @@ Setting up environment
 
   .. code::
 
-    $ git tag --sign -m "Scikit-build $release" $release master
+    $ git tag --sign -m "Scikit-build $release" $release main
 
   .. warning::
 
       We recommend using a `GPG signing key <https://help.github.com/articles/generating-a-new-gpg-key/>`_
       to sign the tag.
 
 
-7. Publish both the release tag and the master branch
+7. Publish both the release tag and the main branch
 
   .. code::
 
     $ git push origin $release && \
-      git push origin master
+      git push origin main
 
 
 8. Make a `GitHub release <https://github.com/scikit-build/scikit-build/releases/new>`_. Paste the converted release notes as markdown; convert using
@@ -144,7 +144,7 @@ Setting up environment
 
     $ git add CHANGES.rst && \
       git commit -m "CHANGES.rst: Add \"Next Release\" section [ci skip]" && \
-      git push origin master
+      git push origin main
 
 
 
@@ -228,8 +228,8 @@ conda-forge, follow the steps below:
 
 6. Modify ``meta.yaml``
 
-   Update the `version string <https://github.com/conda-forge/scikit-build-feedstock/blob/master/recipe/meta.yaml#L2>`_ and
-   `sha256 <https://github.com/conda-forge/scikit-build-feedstock/blob/master/recipe/meta.yaml#L3>`_.
+   Update the `version string <https://github.com/conda-forge/scikit-build-feedstock/blob/main/recipe/meta.yaml#L2>`_ and
+   `sha256 <https://github.com/conda-forge/scikit-build-feedstock/blob/main/recipe/meta.yaml#L3>`_.
 
    We have to modify the sha and the version string in the ``meta.yaml`` file.
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -41,8 +41,8 @@ ignore_missing_imports = true
 
 
 [tool.pylint]
-master.py-version = "3.7"
-master.jobs = "0"
+py-version = "3.7"
+jobs = "0"
 reports.output-format = "colorized"
 similarities.ignore-imports = "yes"
 messages_control.enable = [
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ on: @@
       pull_request:
       push:
         branches:
-        - master
         - main
     concurrency:
@@ Expand Down @@