From 0e922e0d9c3ec8216cb97f09cdcfa80d2795a708 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Tue, 9 Mar 2021 12:40:04 +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 --- .github/workflows/test.yml | 6 +++--- pyproject.toml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 73db9ff..858aab5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,13 +17,13 @@ jobs: django-version: 'qa' # Django >= 3.2 only supports >= Python 3.8 - python-version: '3.8' - django-version: 'dev' + django-version: 'main' experimental: true - python-version: '3.9' - django-version: 'dev' + django-version: 'main' experimental: true - python-version: 'pypy3' - django-version: 'dev' + django-version: 'main' experimental: true steps: diff --git a/pyproject.toml b/pyproject.toml index 8459fc8..ce9139a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ legacy_tox_ini = """ [tox] envlist = py{36,37,38,39,py3}-dj{22,30,31} - py{38,39}-dj{dev} + py{38,39}-djmain py38-djqa [gh-actions] @@ -27,7 +27,7 @@ DJANGO = 2.2: dj22 3.0: dj30 3.1: dj31 - dev: djdev + main: djmain qa: djqa # Normal test environment runs pytest which orchestrates other tools @@ -37,14 +37,14 @@ deps = dj22: django>=2.2,<2.3 dj30: django>=3.0,<3.1 dj31: django>=3.1,<3.2 - djdev: https://github.com/django/django/archive/master.tar.gz + djmain: https://github.com/django/django/archive/main.tar.gz usedevelop = true commands = pytest setenv = PYTHONDONTWRITEBYTECODE=1 # Django development version is allowed to fail the test matrix -[testenv:py{38,39,py3}-dj{dev}] +[testenv:py{38,39,py3}-djmain] ignore_errors = true ignore_outcome = true