From d509e49380edd9efc7951d0d2822421a52607fb0 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Tue, 9 Mar 2021 13:54:29 +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 --- .travis.yml | 8 ++++---- tox.ini | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1431dc..78a9f89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,14 +36,14 @@ matrix: - python: "3.5" env: TOXENV=py35-django-111 - python: "3.5" - env: TOXENV=py35-django-dev + env: TOXENV=py35-django-main - python: "3.6" - env: TOXENV=py36-django-dev + env: TOXENV=py36-django-main allow_failures: - - env: TOXENV=py35-django-dev - - env: TOXENV=py36-django-dev + - env: TOXENV=py35-django-main + - env: TOXENV=py36-django-main install: pip install tox tox-travis coveralls wheel script: tox diff --git a/tox.ini b/tox.ini index 957f2fb..ad21ea4 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ downloadcache = {distshare} args_are_paths = false envlist = - {py35,py36}-django-dev + {py35,py36}-django-main {py27,py34,py35}-django-111 {py27,py34,py35}-django-{19,110} {py27,py34,py35}-django-18 @@ -26,8 +26,8 @@ deps = django-19: Django>=1.9,<1.10 django-110: Django>=1.10,<1.11 django-111: Django>=1.11,<1.12 - django-dev: git+https://github.com/django/django.git#egg=Django - django-{18,19,110,111,dev}: pytest-django>=3.2.0 + django-main: git+https://github.com/django/django.git#egg=Django + django-{18,19,110,111,main}: pytest-django>=3.2.0 -rtests/requirements.txt [travis] @@ -44,7 +44,7 @@ DJANGO = 1.9: django-19 1.10: django-110 1.11: django-111 - dev: django-dev + main: django-main [testenv:flake8] basepython = python3.5