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

feat: Upgrade to Django 2.2 #1132

Merged
merged 23 commits into from
Nov 23, 2020
Merged

feat: Upgrade to Django 2.2 #1132

merged 23 commits into from
Nov 23, 2020

Conversation

faucomte97
Copy link
Contributor

@faucomte97 faucomte97 commented Nov 5, 2020

This change is Reviewable

@faucomte97 faucomte97 self-assigned this Nov 5, 2020
@codecov
Copy link

codecov bot commented Nov 5, 2020

Codecov Report

Merging #1132 (7b3cedd) into django_2_upgrade (0a90653) will increase coverage by 0.12%.
The diff coverage is 93.52%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##           django_2_upgrade    #1132      +/-   ##
====================================================
+ Coverage             91.19%   91.31%   +0.12%     
====================================================
  Files                   110      111       +1     
  Lines                  6155     6197      +42     
====================================================
+ Hits                   5613     5659      +46     
+ Misses                  542      538       -4     
Impacted Files Coverage Δ
game/migrations/0040_auto_20150128_2019.py 100.00% <ø> (ø)
game/migrations/0043_auto_20150615_1155.py 100.00% <ø> (ø)
game/migrations/0060_auto_20160208_2144.py 100.00% <ø> (ø)
game/migrations/0070_update_strings_unicode.py 100.00% <ø> (ø)
game/migrations/0071_use_common_models.py 100.00% <ø> (ø)
game/views/helper.py 75.00% <ø> (ø)
game/views/level_moderation.py 36.66% <ø> (ø)
setup.py 0.00% <ø> (ø)
game/level_management.py 77.52% <50.00%> (ø)
game/permissions.py 50.58% <50.00%> (ø)
... and 27 more

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 0a90653...d8e8048. Read the comment docs.

Copy link
Contributor

@mrniket mrniket left a comment

Choose a reason for hiding this comment

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

Reviewed 19 of 28 files at r1.
Reviewable status: 19 of 28 files reviewed, 1 unresolved discussion (waiting on @faucomte97)


setup.py, line 24 at r1 (raw file):

    include_package_data=True,
    install_requires=[
        "django>=1.11.24, <= 2.0.0",

we only need to support 2.0 if we are running a long-running feature branch

@faucomte97 faucomte97 changed the base branch from master to django_2_upgrade November 6, 2020 11:37
Copy link
Contributor Author

@faucomte97 faucomte97 left a comment

Choose a reason for hiding this comment

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

Reviewable status: 19 of 28 files reviewed, 1 unresolved discussion (waiting on @faucomte97 and @mrniket)


setup.py, line 24 at r1 (raw file):

Previously, mrniket (Niket Shah) wrote…

we only need to support 2.0 if we are running a long-running feature branch

Done.

Copy link
Collaborator

@razvan-pro razvan-pro left a comment

Choose a reason for hiding this comment

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

Reviewed 27 of 28 files at r1, 1 of 1 files at r2.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @faucomte97 and @mrniket)


example_project/example_project/urls.py, line 12 at r2 (raw file):

urlpatterns = [
    url(r"^", include(portal_urls)),
    url(r"^administration/", include((admin.site.urls[0], "admin"), namespace="admin")),

FYI: idea in portal PR.


game/migrations/0001_squashed_0025_levels_ordering_pt1.py, line 5081 at r2 (raw file):

                (
                    "first_level",
                    models.ForeignKey(to="game.Level", on_delete=models.SET_NULL),

I think we also need null=True here if we use SET_NULL

Copy link
Contributor

@mrniket mrniket left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @faucomte97)

Copy link
Contributor Author

@faucomte97 faucomte97 left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @razvan-pro)


example_project/example_project/urls.py, line 12 at r2 (raw file):

Previously, razvan-pro (Razvan Mahu) wrote…

FYI: idea in portal PR.

Done :)


game/migrations/0001_squashed_0025_levels_ordering_pt1.py, line 5081 at r2 (raw file):

Previously, razvan-pro (Razvan Mahu) wrote…

I think we also need null=True here if we use SET_NULL

Actually, this field was removed from the Episode model in migration 0043 so I believe there is no need to specify this.

Copy link
Collaborator

@razvan-pro razvan-pro left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r3.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @faucomte97)


game/migrations/0001_squashed_0025_levels_ordering_pt1.py, line 5081 at r2 (raw file):

Previously, faucomte97 (Florian Aucomte) wrote…

Actually, this field was removed from the Episode model in migration 0043 so I believe there is no need to specify this.

oh ok :)

Copy link
Contributor

@mrniket mrniket left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @faucomte97)


example_project/example_project/urls.py, line 12 at r2 (raw file):

Previously, faucomte97 (Florian Aucomte) wrote…

Done :)

administration 😊

Copy link
Contributor Author

@faucomte97 faucomte97 left a comment

Choose a reason for hiding this comment

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

Reviewable status: 27 of 28 files reviewed, 1 unresolved discussion (waiting on @mrniket and @razvan-pro)


example_project/example_project/urls.py, line 12 at r2 (raw file):

Previously, mrniket (Niket Shah) wrote…

administration 😊

🙃

Copy link
Contributor

@mrniket mrniket left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r4.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @faucomte97)

Copy link
Collaborator

@razvan-pro razvan-pro left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r4, 3 of 3 files at r5.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @faucomte97)

@faucomte97 faucomte97 changed the title feat: Upgrade to Django 2.0 feat: Upgrade to Django 2.2 Nov 17, 2020
Copy link
Collaborator

@razvan-pro razvan-pro left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 33 files at r6, 32 of 33 files at r7, 5 of 5 files at r8.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @faucomte97)

@faucomte97 faucomte97 merged commit aacebbc into django_2_upgrade Nov 23, 2020
@faucomte97 faucomte97 deleted the django_2_0_test branch November 23, 2020 18:30
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