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

Django 4.2 support #59

Merged
merged 17 commits into from
Aug 4, 2023
Merged

Django 4.2 support #59

merged 17 commits into from
Aug 4, 2023

Conversation

salman2013
Copy link
Contributor

@salman2013 salman2013 commented Jul 12, 2023

  1. Add django42 support.
    2 Update package version to '0.4.0'

@salman2013 salman2013 changed the title Django 4.2 upgrade Django 4.2 support Jul 24, 2023
@awais786 awais786 marked this pull request as ready for review July 31, 2023 11:21
@awais786 awais786 force-pushed the salman/django-4.2.upgrade branch 2 times, most recently from a67c3fc to 226ad23 Compare July 31, 2023 11:42
tox.ini Outdated
@@ -21,17 +21,17 @@ whitelist_externals =
deps =
django31: Django>=3.1,<3.2
Copy link
Member

Choose a reason for hiding this comment

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

I guess, this line should be removed as well.

tox.ini Outdated Show resolved Hide resolved
@@ -19,19 +19,17 @@ whitelist_externals =
mkdir
rm
deps =
django31: Django>=3.1,<3.2
django32: Django>=3.2,<4.0
Copy link
Member

Choose a reason for hiding this comment

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

We only need to remove django31: Django>=3.1,<3.2.

django32 shouldn't be removed.

Am I right?

mkdir -p {toxinidir}/var/logs
rm -rf {toxinidir}/var/logs/*
pytest {posargs}
Copy link
Member

Choose a reason for hiding this comment

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

Is it intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@awais786 make this change when fixing test cases.

# via edx-i18n-tools
platformdirs==2.5.2
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

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

⚠️⚠️⚠️ Conflict here.

@salman2013 salman2013 merged commit 710f5aa into master Aug 4, 2023
4 checks passed
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.

3 participants