Add support for Dj40, drop Py36 and Dj31 #1039

Andrew-Chen-Wang · 2021-12-14T16:49:29Z

Description of the Change

Add support for Dj40, drop Py36 and Dj31

Dj31 and Py36 will be EOL end of this December of 2021. I do not want to hold back any PRs that need to support old versions of stuff, thus I have dropped those two.

Checklist

PR only contains one change (considered splitting up PR)
unit-test added
documentation updated
CHANGELOG.md updated (only for user relevant changes)
author name in AUTHORS

Andrew-Chen-Wang · 2021-12-14T16:51:54Z

Note: do not merge this as of yet. I'll need to run the quick migration.

codecov · 2021-12-14T16:55:58Z

Codecov Report

Merging #1039 (fd891d7) into master (d25cb27) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #1039   +/-   ##
=======================================
  Coverage   96.64%   96.64%           
=======================================
  Files          31       31           
  Lines        1756     1756           
=======================================
  Hits         1697     1697           
  Misses         59       59

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d25cb27...fd891d7. Read the comment docs.

Andrew-Chen-Wang · 2021-12-14T17:05:06Z

@n2ygk In the settings, you'll need to remove the required check for Python 3.6 due to the dropping of Python 3.6 in this PR. Thanks!

Andrew-Chen-Wang · 2021-12-14T17:19:44Z

I believe there is a bug in Django which is mentioned in #1037. I'm not sure how to resolve it, but it seems like an unintended bug in Django itself, not our end. I've filed a bug (which will probably get closed wontfix) https://code.djangoproject.com/ticket/33366

@auvipy I will be taking finals for next 3 days, so please take over. Cheers :)

.github/workflows/test.yml

auvipy

ok will check what remains

auvipy · 2021-12-15T05:18:04Z

I think python 3.10 is not backported in django 3.2?

auvipy · 2021-12-15T05:24:13Z

build (3.6) Expected — Waiting for status to be reported what is this build?

Andrew-Chen-Wang · 2021-12-15T05:28:13Z

I removed Py36. Authors in settings can require certain builds to be successful before PR merge. Authors should disable this. If they don't then we can add Python 3.6 back in to circumvent.

auvipy · 2021-12-15T05:28:21Z

I am not really sure why python 3.10 is failing

Andrew-Chen-Wang · 2021-12-15T06:35:57Z

Please do not merge until the migration file is properly fixed.

auvipy · 2021-12-15T10:22:15Z

we actually cant merge this due to required check. also the migration issue is not actual issue. thats due to django new settings/features as far as I know.

Andrew-Chen-Wang · 2021-12-15T15:24:20Z

Yes, however, like Django 3.2, users kept creating migration files inside the package itself since people were using virtual envs. This is unintended behavior and can cause huge issues down the road when adding new migration files as migration file IDs will be duplicated due to an accidental dev-side migration.

TL;DR if we don't fix the migration file issue, people's production servers will crash.

Andrew-Chen-Wang · 2021-12-15T18:44:12Z

@auvipy Python 3.10 failing due to main branch of Django. Somehow sqlite3.OperationalError: Cannot add a UNIQUE column this error is now popping up. Must mean either a bug or something new that we're not aware of.

@n2ygk @jezdez In the settings, you'll need to remove the required check for Python 3.6 due to the dropping of Python 3.6 in this PR. Thanks!

auvipy · 2021-12-16T05:41:10Z

as I said this seems to be a regression in django https://github.com/django/django/pull/15205/files

auvipy · 2021-12-16T14:29:05Z

Also I don't think it's a blocker for release. we can drop this after a new release

Andrew-Chen-Wang · 2021-12-16T14:31:00Z

Sounds good! Also Django 3.2.9 added support for Py310

auvipy · 2021-12-16T14:49:05Z

not a problem, we can do 1.6.1 soon :D

jezdez · 2021-12-16T15:49:03Z

@n2ygk @jezdez In the settings, you'll need to remove the required check for Python 3.6 due to the dropping of Python 3.6 in this PR. Thanks!

Done that.

jezdez · 2021-12-16T15:51:27Z

Also I don't think it's a blocker for release. we can drop this after a new release

FWIW dropping support for a Django or Python version shouldn't be done in a patch version, I'd suggest to do a 1.7.0 with this change applied.

Andrew-Chen-Wang

@jezdez I think this should be merged though with a change in setup.py to disallow Django 4.0.0 but allow 4.0.1. That way it'd be included in this new minor release as it seems like current maintainers are fairly busy.

We can just delete the current git tag and re tag since not released on pypi yet

tox.ini

* Installation should block 4.0.0 in my opinion to avoid anyone's production sit e from going down due to this package. This is only the case if someone runs mak emigrations on their production server (for any bad reason). * Updated docs to reflect the changes in this PR

@Andrew-Chen-Wang

* As of Dec 19, 2021, Django 4.0.1 has not released changes to fix a regression.It is a user-end regression that does not affect usability, but it does affect user's belief that they need to create a migration. In @Andrew-Chen-Wang's past experience, that has led to production errors and an emergency migration of one of his past packages...

n2ygk · 2021-12-19T14:52:45Z

@Andrew-Chen-Wang oops you and I crossed commits in the mail... I think the tox should be what I had if my understanding is correct:

-    dj40: Django>=4.0.1,<4.1
+    dj40: Django>=4.0.0,<4.1

Andrew-Chen-Wang · 2021-12-19T14:53:56Z

Nope! Django 4.0.1 isn't released yet, but I do want to test 4.0. Please read my explanation above 😅 (sorry edited it awhile ago).

n2ygk · 2021-12-19T15:02:29Z

Nope! Django 4.0.1 isn't released yet, but I do want to test 4.0. Please read my explanation above 😅 (sorry edited it awhile ago).

D'oh!

Looks like everything but py310 passed the tests.

Andrew-Chen-Wang · 2021-12-19T15:46:00Z

Resolved. Tests should be passing.

Hmm that's why auvipy removed it due to Django main failing on Python 3.10. I personally don't understand what's going on 😅, but what I do know now is that it's also failing on Python 3.9 and others, but Too successfully ignored those ones but didn't properly ignore Python 3.10. I'll get tox to ignore the errors then.

Also, do you mind requiring Python 3.10 in the settings? Thanks!

Andrew-Chen-Wang · 2021-12-19T15:49:35Z

This should be the last PR, so it'll require deleting the 1.6.0 git tag release and recreating it to include this PR. Also enabling Python 3.10 requirement in CI in the GitHub settings. Finally, you'll be able to make the Jazzband release. Thanks for a great library!

n2ygk · 2021-12-19T18:28:21Z

Looks like a failure in 3.9 now so will need to investigate that.

n2ygk · 2021-12-19T19:19:00Z

Looks like a failure in 3.9 now so will need to investigate that.

Hmm. ran tox locally and 3.9 was OK:

  docs: commands succeeded
  py37-dj22: commands succeeded
  py38-dj22: commands succeeded
  py39-dj22: commands succeeded
  py37-dj32: commands succeeded
  py38-dj32: commands succeeded
  py39-dj32: commands succeeded
  py310-dj32: commands succeeded
  py38-dj40: commands succeeded
  py39-dj40: commands succeeded
  py310-dj40: commands succeeded
  py38-djmain: ignored failed command
  py39-djmain: ignored failed command
  py310-djmain: ignored failed command

(flake8 failed locally due to an old build directory laying around.)

per https://django-oauth-toolkit.readthedocs.io/en/stable/contributing.html#pull-requests.

n2ygk · 2021-12-19T21:03:33Z

I took the liberty of using this PR to update the CHANGELOG to be hopefully more user-friendly. We don't need to list every single PR and issue, only those that have an impact on a user considering upgrading.

Andrew-Chen-Wang added the enhancement label Dec 14, 2021

Andrew-Chen-Wang requested a review from auvipy December 14, 2021 16:49

Andrew-Chen-Wang mentioned this pull request Dec 14, 2021

Do there any blockers to bump new release? #1000

Closed

auvipy reviewed Dec 15, 2021

View reviewed changes

.github/workflows/test.yml Show resolved Hide resolved

auvipy reviewed Dec 15, 2021

View reviewed changes

auvipy approved these changes Dec 15, 2021

View reviewed changes

Andrew-Chen-Wang commented Dec 16, 2021

View reviewed changes

tox.ini Outdated Show resolved Hide resolved

Andrew-Chen-Wang and others added 4 commits December 19, 2021 09:25

Add support for Dj40, drop Py36 and Dj31

f952ab5

Update tox.ini

4a5e294

remove python 3.10 from CI

5153ac9

Per django/django#15205 make minimum version of dj40 be 4.0.1.

168c438

n2ygk force-pushed the dj4 branch from ab29aea to 168c438 Compare December 19, 2021 14:29

n2ygk requested a review from jezdez December 19, 2021 14:30

n2ygk changed the title ~~Add support for Dj40, drop Py36 and Dj31~~ WIP: Add support for Dj40, drop Py36 and Dj31 Dec 19, 2021

n2ygk and others added 3 commits December 19, 2021 09:41

Add py310 to GH test action.

00d382f

Andrew-Chen-Wang requested a review from n2ygk December 19, 2021 14:49

Ignore dj310-djmain

d06fd89

Andrew-Chen-Wang changed the title ~~WIP: Add support for Dj40, drop Py36 and Dj31~~ Add support for Dj40, drop Py36 and Dj31 Dec 19, 2021

Update CHANGELOG.md (only for user relevant changes).

fd891d7

per https://django-oauth-toolkit.readthedocs.io/en/stable/contributing.html#pull-requests.

n2ygk approved these changes Dec 19, 2021

View reviewed changes

n2ygk removed the request for review from jezdez December 19, 2021 21:13

n2ygk merged commit 6aeb1b2 into master Dec 19, 2021

Andrew-Chen-Wang deleted the dj4 branch December 20, 2021 00:28

n2ygk mentioned this pull request Dec 21, 2021

Resolve issues with Django >= 4.0 #1051

Closed

2 tasks

adamchainz mentioned this pull request Sep 5, 2022

Test Django 4.1 and remove upper version bound #1203

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for Dj40, drop Py36 and Dj31 #1039

Add support for Dj40, drop Py36 and Dj31 #1039

Andrew-Chen-Wang commented Dec 14, 2021 •

edited

Andrew-Chen-Wang commented Dec 14, 2021

codecov bot commented Dec 14, 2021 •

edited

Andrew-Chen-Wang commented Dec 14, 2021

Andrew-Chen-Wang commented Dec 14, 2021

auvipy left a comment

auvipy commented Dec 15, 2021

auvipy commented Dec 15, 2021

Andrew-Chen-Wang commented Dec 15, 2021

auvipy commented Dec 15, 2021

Andrew-Chen-Wang commented Dec 15, 2021

auvipy commented Dec 15, 2021

Andrew-Chen-Wang commented Dec 15, 2021 •

edited

Andrew-Chen-Wang commented Dec 15, 2021

auvipy commented Dec 16, 2021

auvipy commented Dec 16, 2021

Andrew-Chen-Wang commented Dec 16, 2021 •

edited

auvipy commented Dec 16, 2021

jezdez commented Dec 16, 2021

jezdez commented Dec 16, 2021

Andrew-Chen-Wang left a comment •

edited

n2ygk commented Dec 19, 2021

Andrew-Chen-Wang commented Dec 19, 2021

n2ygk commented Dec 19, 2021

Andrew-Chen-Wang commented Dec 19, 2021 •

edited

Andrew-Chen-Wang commented Dec 19, 2021

n2ygk commented Dec 19, 2021

n2ygk commented Dec 19, 2021 •

edited

n2ygk commented Dec 19, 2021

Add support for Dj40, drop Py36 and Dj31 #1039

Add support for Dj40, drop Py36 and Dj31 #1039

Conversation

Andrew-Chen-Wang commented Dec 14, 2021 • edited

Description of the Change

Checklist

Andrew-Chen-Wang commented Dec 14, 2021

codecov bot commented Dec 14, 2021 • edited

Codecov Report

Andrew-Chen-Wang commented Dec 14, 2021

Andrew-Chen-Wang commented Dec 14, 2021

auvipy left a comment

Choose a reason for hiding this comment

auvipy commented Dec 15, 2021

auvipy commented Dec 15, 2021

Andrew-Chen-Wang commented Dec 15, 2021

auvipy commented Dec 15, 2021

Andrew-Chen-Wang commented Dec 15, 2021

auvipy commented Dec 15, 2021

Andrew-Chen-Wang commented Dec 15, 2021 • edited

Andrew-Chen-Wang commented Dec 15, 2021

auvipy commented Dec 16, 2021

auvipy commented Dec 16, 2021

Andrew-Chen-Wang commented Dec 16, 2021 • edited

auvipy commented Dec 16, 2021

jezdez commented Dec 16, 2021

jezdez commented Dec 16, 2021

Andrew-Chen-Wang left a comment • edited

Choose a reason for hiding this comment

n2ygk commented Dec 19, 2021

Andrew-Chen-Wang commented Dec 19, 2021

n2ygk commented Dec 19, 2021

Andrew-Chen-Wang commented Dec 19, 2021 • edited

Andrew-Chen-Wang commented Dec 19, 2021

n2ygk commented Dec 19, 2021

n2ygk commented Dec 19, 2021 • edited

n2ygk commented Dec 19, 2021

Andrew-Chen-Wang commented Dec 14, 2021 •

edited

codecov bot commented Dec 14, 2021 •

edited

Andrew-Chen-Wang commented Dec 15, 2021 •

edited

Andrew-Chen-Wang commented Dec 16, 2021 •

edited

Andrew-Chen-Wang left a comment •

edited

Andrew-Chen-Wang commented Dec 19, 2021 •

edited

n2ygk commented Dec 19, 2021 •

edited