Skip to content

Commit

Permalink
ci,tox,README: adjust to django branch master -> main
Browse files Browse the repository at this point in the history
  • Loading branch information
bluetech committed Mar 13, 2021
1 parent 9db6ec8 commit 04134ae
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
python: 3.8
allow_failure: false

- name: py39-djmaster-sqlite-coverage
- name: py39-djmain-sqlite-coverage
python: 3.9
allow_failure: true

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pytest-django allows you to test your Django project/applications with the
<https://pytest-django.readthedocs.io/en/latest/contributing.html>`_
* Version compatibility:

* Django: 2.2, 3.0, 3.1 and latest master branch (compatible at the time of
* Django: 2.2, 3.0, 3.1 and latest main branch (compatible at the time of
each release)
* Python: CPython>=3.5 or PyPy 3
* pytest: >=5.4
Expand Down
2 changes: 1 addition & 1 deletion pytest_django/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ def _django_set_urlconf(request):
def restore():
django.conf.settings.ROOT_URLCONF = original_urlconf
# Copy the pattern from
# https://github.com/django/django/blob/master/django/test/signals.py#L152
# https://github.com/django/django/blob/main/django/test/signals.py#L152
clear_url_caches()
set_urlconf(None)

Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ envlist =
[testenv]
extras = testing
deps =
djmaster: https://github.com/django/django/archive/master.tar.gz
djmain: https://github.com/django/django/archive/main.tar.gz
dj32: Django>=3.2b1,<4.0
dj31: Django>=3.1,<3.2
dj30: Django>=3.0,<3.1
Expand Down

0 comments on commit 04134ae

Please sign in to comment.