From 13dc12d49c6c803606ca4fa32fa68d14934565da Mon Sep 17 00:00:00 2001 From: Mathieu Leplatre Date: Mon, 22 Jan 2024 14:31:06 +0100 Subject: [PATCH] Rename master branch to main --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- .github/workflows/admin.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/functional.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 6 +++--- CONTRIBUTING.md | 2 +- README.rst | 8 ++++---- docs/community.rst | 4 ++-- docs/configuration/production.rst | 2 +- docs/tutorials/install.rst | 2 +- setup.cfg | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 6f9a5922c..3e90f61af 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,5 +4,5 @@ Fixes # - [ ] Add tests. - [ ] Add a changelog entry. - [ ] Add your name in the contributors file. -- [ ] If you changed the HTTP API, update the [API_VERSION](https://github.com/Kinto/kinto/blob/master/kinto/__init__.py#L15) constant and add an API changelog entry [in the docs](https://github.com/Kinto/kinto/blob/master/docs/api/index.rst) -- [ ] If you added a new configuration setting, update the [`kinto.tpl`](https://github.com/Kinto/kinto/blob/master/kinto/config/kinto.tpl) file with it. +- [ ] If you changed the HTTP API, update the [API_VERSION](https://github.com/Kinto/kinto/blob/main/kinto/__init__.py#L15) constant and add an API changelog entry [in the docs](https://github.com/Kinto/kinto/blob/main/docs/api/index.rst) +- [ ] If you added a new configuration setting, update the [`kinto.tpl`](https://github.com/Kinto/kinto/blob/main/kinto/config/kinto.tpl) file with it. diff --git a/.github/workflows/admin.yml b/.github/workflows/admin.yml index 2492289c2..00a201dcf 100644 --- a/.github/workflows/admin.yml +++ b/.github/workflows/admin.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: Kinto Admin diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index d440d1872..4eef80ae2 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: Docs diff --git a/.github/workflows/functional.yml b/.github/workflows/functional.yml index f26b70c59..28d8f9662 100644 --- a/.github/workflows/functional.yml +++ b/.github/workflows/functional.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: Functional Testing diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index bfbb526ac..b45da24d7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: Lint diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e15593e94..c2b334cd1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: Unit Testing @@ -83,7 +83,7 @@ jobs: run: | source .venv/bin/activate tox -e ${{ matrix.toxenv }} - + - name: Coveralls for ${{ matrix.toxenv }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -92,7 +92,7 @@ jobs: run: | source .venv/bin/activate coveralls --service=github - + coveralls: name: Coveralls Finished needs: chore diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 43506e05a..6e8439bff 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,7 @@ Thanks for considering submitting a pull request, we really appreciate that! Before doing so, here are a few guidelines: * You agree to license your contributions under the - [license](https://github.com/Kinto/kinto/blob/master/LICENSE). + [license](https://github.com/Kinto/kinto/blob/main/LICENSE). * Use pull-requests early so it's open for discussion, even if your contribution isn't ready yet. * All pull requests should include tests, as they help us avoid regressions in diff --git a/README.rst b/README.rst index f6f4d9cd5..cb856b2f8 100644 --- a/README.rst +++ b/README.rst @@ -1,10 +1,10 @@ Kinto ===== -|coc| |gitter| |readthedocs| |pypi| |ci| |master-coverage| +|coc| |gitter| |readthedocs| |pypi| |ci| |main-coverage| .. |coc| image:: https://img.shields.io/badge/%E2%9D%A4-code%20of%20conduct-blue.svg - :target: https://github.com/Kinto/kinto/blob/master/CODE_OF_CONDUCT.md + :target: https://github.com/Kinto/kinto/blob/main/CODE_OF_CONDUCT.md :alt: Code of conduct .. |gitter| image:: https://badges.gitter.im/Kinto/kinto.svg @@ -17,8 +17,8 @@ Kinto :target: https://kinto.readthedocs.io/en/latest/ :alt: Documentation Status -.. |master-coverage| image:: - https://coveralls.io/repos/Kinto/kinto/badge.svg?branch=master +.. |main-coverage| image:: + https://coveralls.io/repos/Kinto/kinto/badge.svg?branch=main :alt: Coverage :target: https://coveralls.io/r/Kinto/kinto diff --git a/docs/community.rst b/docs/community.rst index 527655822..d720636c0 100644 --- a/docs/community.rst +++ b/docs/community.rst @@ -200,7 +200,7 @@ Before we merge a pull request, we check that it meets these guidelines: 1. The pull request should include tests. 2. If the pull request adds functionality, the docs should be updated. 3. *CI* integration tests should be *green* :) It will make sure the tests - pass with `every supported version of Python `_. + pass with `every supported version of Python `_. Hack core libraries @@ -324,7 +324,7 @@ Once the pull-request is approved, merge it and initiate a release. .. code-block:: bash - $ git checkout master + $ git checkout main $ git tag -a X.Y.Z -m "X.Y.Z" $ git push origin X.Y.Z diff --git a/docs/configuration/production.rst b/docs/configuration/production.rst index 87f0ac053..80e90b820 100644 --- a/docs/configuration/production.rst +++ b/docs/configuration/production.rst @@ -386,7 +386,7 @@ Running with uWSGI To run the application using uWSGI, an **app.wsgi** file must be picked up. It is available in the *Kinto* Python package or can be downloaded from GitHub:: - wget https://raw.githubusercontent.com/Kinto/kinto/master/app.wsgi + wget https://raw.githubusercontent.com/Kinto/kinto/main/app.wsgi uWSGI can be configured from the main ``.ini`` file. Just run it with:: diff --git a/docs/tutorials/install.rst b/docs/tutorials/install.rst index 0bb262585..819e069dd 100644 --- a/docs/tutorials/install.rst +++ b/docs/tutorials/install.rst @@ -131,7 +131,7 @@ with a *PostgreSQL* container. :: - wget https://raw.githubusercontent.com/Kinto/kinto/master/docker-compose.yml + wget https://raw.githubusercontent.com/Kinto/kinto/main/docker-compose.yml sudo docker-compose up Now you can: diff --git a/setup.cfg b/setup.cfg index e8f39127e..642be7335 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ license = Apache License (2.0) author = Mozilla Services author_email = storage-team@mozilla.com url = https://github.com/Kinto/kinto -download_url = https://github.com/Kinto/kinto/tarball/master +download_url = https://github.com/Kinto/kinto/tarball/main keywords = web sync json storage services classifiers = Programming Language :: Python