Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Added support for Django42 #346

Merged
merged 2 commits into from
Oct 6, 2023
Merged

Conversation

zubairshakoorarbisoft
Copy link
Contributor

@zubairshakoorarbisoft zubairshakoorarbisoft commented Sep 8, 2023

Issue: #344

@zubairshakoorarbisoft zubairshakoorarbisoft requested a review from a team as a code owner September 8, 2023 14:17
@iamsobanjaved iamsobanjaved linked an issue Sep 20, 2023 that may be closed by this pull request
Copy link
Member

@UsamaSadiq UsamaSadiq left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make validate command installs Django==3.2.20 from requirements/base.txt before running tests which overrides the Django version installed by tox when setting up the environment so we won't be able to run tests with multiple django versions in CI.
The current CI Djanog 4.2 checks are also running tests with Django 3.2 [See the Django40 warnings still being produced in the logs for proof].
In short, we can remove this addition of django42 in the current PR and do the jump directly from Django 32 to Django42 in the follow up Upgrade PR.

@@ -33,7 +33,7 @@ class HasAccessToken(BasePermission):
def has_permission(self, request, view):
if getattr(settings, 'DISABLE_TOKEN_CHECK', False):
return True
token = request.META.get('HTTP_X_ANNOTATOR_AUTH_TOKEN', '')
token = request.headers.get('x-annotator-auth-token', '')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

@jansenk jansenk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, thanks

@UsamaSadiq UsamaSadiq merged commit 5d62349 into master Oct 6, 2023
10 checks passed
@UsamaSadiq UsamaSadiq deleted the zshkoor/django42-support branch October 6, 2023 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add Django 4.2 in CI in notes-api
5 participants