Skip to content

Commit

Permalink
Merge remote-tracking branch 'q0w/django5' into gha
Browse files Browse the repository at this point in the history
  • Loading branch information
iMerica committed Apr 13, 2024
2 parents 1d38f0b + aa39dca commit 05afb16
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions dj_rest_auth/tests/requirements.pip
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
coveralls==1.11.1
django-allauth==0.61.1
django>=2.2,<5.0
djangorestframework-simplejwt==4.6.0
django>=2.2
djangorestframework-simplejwt>=5.3.1
flake8==3.8.4
responses==0.12.1
unittest-xml-reporting==3.0.4
2 changes: 1 addition & 1 deletion dj_rest_auth/tests/test_serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from allauth.socialaccount.providers.facebook.views import FacebookOAuth2Adapter
from allauth.socialaccount.providers.facebook.views import FacebookProvider
from allauth.socialaccount.models import SocialApp
from allauth.exceptions import ImmediateHttpResponse
from allauth.core.exceptions import ImmediateHttpResponse
from django.contrib.auth import get_user_model
from django.urls import reverse
from django.core.exceptions import ValidationError
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
keywords='django rest auth registration rest-framework django-registration api',
zip_safe=False,
install_requires=[
'Django>=3.2,<5.0',
'Django>=3.2',
'djangorestframework>=3.13.0',
],
extras_require={
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ commands =
python ./runtests.py
deps =
-rdj_rest_auth/tests/requirements.pip
django3: Django>=3.2
django4: Django>=4.0,<4.3
django5: Django>=5.0,<=5.0.4
django3: Django>=3.2,<4.0
django4: Django>=4.0,<5.0
django5: Django>=5.0,<6.0

# Configuration for coverage and flake8 is being set in `./setup.cfg`
[testenv:coverage]
Expand Down

0 comments on commit 05afb16

Please sign in to comment.