From 9025d593080da418b16b136835abfd4f7405ceef Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Tue, 9 Mar 2021 12:19:23 +0100 Subject: [PATCH] Rename Django's dev branch to main. More information: https://groups.google.com/g/django-developers/c/tctDuKUGosc/ Refs: https://github.com/django/django/pull/14048 --- docs/_ext/djangodocs.py | 2 +- tox.ini | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py index a88a9f8..c6c8354 100644 --- a/docs/_ext/djangodocs.py +++ b/docs/_ext/djangodocs.py @@ -1,4 +1,4 @@ -# Taken from https://github.com/django/django/blob/master/docs/_ext/djangodocs.py +# Taken from https://github.com/django/django/blob/main/docs/_ext/djangodocs.py import re from sphinx import addnodes diff --git a/tox.ini b/tox.ini index 759cc7d..4959813 100644 --- a/tox.ini +++ b/tox.ini @@ -8,8 +8,8 @@ exclude = migrations/*,docs/* envlist = py35-{2.2}, py36-{2.2,3.0,3.1}, - py37-{2.2,3.0,3.1,master}, - py38-{2.2,3.0,3.1,master}, + py37-{2.2,3.0,3.1,main}, + py38-{2.2,3.0,3.1,main}, [gh-actions] python = @@ -26,7 +26,7 @@ deps = 3.1: Django>=3.1,<3.2 3.0: Django>=3.0,<3.1 2.2: Django>=2.2,<2.3 - master: https://github.com/django/django/tarball/master + main: https://github.com/django/django/tarball/main setenv= DJANGO_SETTINGS_MODULE = example.settings PYTHONPATH = {toxinidir}/example:{toxinidir}