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

Rename master branch to main #3355

Merged
merged 1 commit into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion .github/workflows/admin.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:

name: Kinto Admin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:

name: Docs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/functional.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:

name: Functional Testing
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:

name: Lint
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:

name: Unit Testing
Expand Down Expand Up @@ -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 }}
Expand All @@ -92,7 +92,7 @@ jobs:
run: |
source .venv/bin/activate
coveralls --service=github

coveralls:
name: Coveralls Finished
needs: chore
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions docs/community.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/Kinto/kinto/blob/master/tox.ini#L2>`_.
pass with `every supported version of Python <https://github.com/Kinto/kinto/blob/main/tox.ini#L2>`_.


Hack core libraries
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/configuration/production.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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::

Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down