From 29b0a760c59586d9c6fbb1c179c1c02b092721a5 Mon Sep 17 00:00:00 2001 From: abhiabhi94 <13880786+abhiabhi94@users.noreply.github.com> Date: Wed, 10 Mar 2021 12:18:20 +0530 Subject: [PATCH] :truck: chore: Rename master branch to main --- .travis.yml | 3 ++- README.rst | 12 ++++++------ docs/introduction.rst | 4 ++-- tox.ini | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index ee7d806..a8d16ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ env: - DJANGO=2.2 - DJANGO=3.0 - DJANGO=3.1 - - DJANGO=master + - DJANGO=main install: pip install tox-travis coveralls script: @@ -27,4 +27,5 @@ jobs: password: secure: u9OkdMaFzq/IE+ioARENz57DGYAOAQer4qpvdfAnL4KNR91Dw6E61V8m/BX3R6rnKldMoXMpzSXWQLmEqcnU5x00uO2P2f///gSbCp79KZzXhc7SmTYMiDfgeQ8t4GPx3YK6gPluG4Js46DDBhlTW6wDht0vg9I5KfzrcbGLQ5PHGT+S5YXBDRd32YxTbFDHo0/rgJbslWbPTCTuRlOLhXh0TYnoS3IYguDzEMB2Vnq4eW0I1npQlrZtzVCYh9kgRCmaalEgZ9P7X013U649OUXisb5V3pRdEa9+jfGNK14tLEuiIZjqr4lLKmoCq/wlT5sPFG1M29B0JmP22fAO7cQSxJq2Kl+P3o3QHEZ+PJqN9bgi+Yn+HDabyWel731gCA2UPaeS2qoppSJrxfAOIwgtPoQs7XP2+ml803A4F3P9EF6odery4GFR57kll5aJGlGC9dxHKGY0NO77vtPKZQscW90DiFXRmNEtFCvkarOJLvVCiNHiJww3TxkzBS+eRTkTTN0rRRT6nNMlfSlSTVX83ggDboCFHMMarOzeOQRq1V6n1RheME6P+u31bNSq0Swh+I95MvvFJdmu4dlSCc/pAQ5pOZ9HZmLc0cwkNaaQ8m1ZkhqhFDySvlXhTKslANnxCaXuRRTAWso+1tfSpY9LmYHW00kgRX647C1yYhA= on: + branch: main tags: true diff --git a/README.rst b/README.rst index 9606eef..a17a288 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ django-flag-app =============== -.. image:: https://travis-ci.org/abhiabhi94/django-flag-app.svg?branch=master +.. image:: https://travis-ci.org/abhiabhi94/django-flag-app.svg?branch=main :target: https://travis-ci.org/abhiabhi94/django-flag-app :alt: build @@ -27,21 +27,21 @@ django-flag-app :alt: docs .. image:: https://img.shields.io/github/license/abhiabhi94/django-flag-app?color=gr - :target: https://github.com/abhiabhi94/django-flag-app/blob/master/LICENSE + :target: https://github.com/abhiabhi94/django-flag-app/blob/main/LICENSE :alt: licence A pluggable django application that adds the ability for users to flag(or report) your models. -.. image:: https://github.com/abhiabhi94/django-flag-app/blob/master/docs/_static/images/django-flag-app.gif +.. image:: https://github.com/abhiabhi94/django-flag-app/blob/main/docs/_static/images/django-flag-app.gif :alt: flagging-process For complete documentation you may visit `Read the Doc`_. or see the `docs`_ directory. .. _Read the Doc: https://django-flag-app.readthedocs.io -.. _docs: https://github.com/abhiabhi94/django-flag-app/blob/master/docs/ +.. _docs: https://github.com/abhiabhi94/django-flag-app/blob/main/docs/ Installation ------------ @@ -128,7 +128,7 @@ Use template tag If you want to use web API, this step is not required. See further instructions at `Web API`_. -.. _Web API: https://github.com/abhiabhi94/django-flag-app/blob/master/docs/webAPI.rst +.. _Web API: https://github.com/abhiabhi94/django-flag-app/blob/main/docs/webAPI.rst ``render_flag_form`` tag requires 2 required positional arguments: @@ -148,4 +148,4 @@ Contributing Please see the instructions at `Contributing`_. -.. _Contributing: https://github.com/abhiabhi94/django-flag-app/blob/master/CONTRIBUTING.rst +.. _Contributing: https://github.com/abhiabhi94/django-flag-app/blob/main/CONTRIBUTING.rst diff --git a/docs/introduction.rst b/docs/introduction.rst index bf00c0d..5bf72a9 100644 --- a/docs/introduction.rst +++ b/docs/introduction.rst @@ -1,7 +1,7 @@ django-flag-app =============== -.. image:: https://travis-ci.org/abhiabhi94/django-flag-app.svg?branch=master +.. image:: https://travis-ci.org/abhiabhi94/django-flag-app.svg?branch=main :target: https://travis-ci.org/abhiabhi94/django-flag-app :alt: build @@ -26,7 +26,7 @@ django-flag-app :alt: docs .. image:: https://img.shields.io/github/license/abhiabhi94/django-flag-app?color=gr - :target: https://github.com/abhiabhi94/django-flag-app/blob/master/LICENSE + :target: https://github.com/abhiabhi94/django-flag-app/blob/main/LICENSE :alt: licence A pluggable django application that adds the ability for users to flag(or report) your models. diff --git a/tox.ini b/tox.ini index 4e91813..3610baf 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{36,37,38}-{dj21, dj22, dj30, dj31, djmaster} + py{36,37,38}-{dj21, dj22, dj30, dj31, djmain} [travis] python = @@ -14,7 +14,7 @@ DJANGO = 2.2: dj22 3.0: dj30 3.1: dj31 - master: djmaster + main: djmain [testenv] deps = @@ -26,7 +26,7 @@ deps = dj22: Django>=2.2,<2.3 dj30: Django>=3.0,<3.1 dj31: Django>=3.1,<3.2 - djmaster: https://github.com/django/django/archive/master.tar.gz + djmain: https://github.com/django/django/archive/main.tar.gz usedevelop = True