-
-
Notifications
You must be signed in to change notification settings - Fork 862
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
Upgrade Python to 3.8.2 and Django to 3.0.7 #1507
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
becabef
Upgrade Python to 3.8.2 and Django to 3.0.7 #1501
czlee 256cd95
Remove django-jet, upgrade more modules
czlee 3d1cdc8
Merge branch 'develop' into feature/django-3
czlee 13efe2e
Add Django 3-compatible version of django-jet #1501
czlee e6b6224
Change django-jet package #1501
czlee File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
3.6.8 | ||
3.8.2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,18 @@ | ||
# The necessary dependencies to run Tabbycat | ||
|
||
# Django | ||
Django==2.2.13 | ||
Django==3.0.7 | ||
django-appconf==1.0.3 # Helper for handling app configs | ||
django-dynamic-preferences==1.7.1 # Settings management | ||
django-extensions==2.2.1 # For the generate secret command | ||
django-formtools==2.1 # Form wizards | ||
django-dynamic-preferences==1.9 # Settings management | ||
django-extensions==2.2.9 # For the generate secret command | ||
django-formtools==2.2 # Form wizards | ||
django-ipware==2.1.0 # IP Address logging | ||
django-jet==1.0.8 # Admin Backend | ||
django-gfklookupwidget==1.0.7 # Replaces object_id field with a search link | ||
djangorestframework==3.10.2 # For serialising objects | ||
django-gfklookupwidget==1.0.8 # Replaces object_id field with a search link | ||
djangorestframework==3.11.0 # For serialising objects | ||
django-polymorphic==2.1.2 # Permits model polymorphism | ||
django-split-settings==1.0.0 # Modularise settings files | ||
django-statici18n==1.8.3 # Compile translations files as static file | ||
django-summernote==0.8.11.4 # WYSIWYG editor | ||
munkres==1.1.2 # Algorithm for adjudicator allocation | ||
django-summernote==0.8.11.6 # WYSIWYG editor | ||
dj-cmd==1.0 # Provides the dj command alias | ||
|
||
# Database | ||
|
@@ -30,7 +28,13 @@ channels==2.2.0 # Channels; also includes the Daphne ser | |
channels_redis==2.4.2 # Channels Layer | ||
|
||
# Misc | ||
ipython==7.11.* | ||
ipython==7.15.* | ||
munkres==1.1.2 # Algorithm for adjudicator allocation | ||
redis==3.3.8 | ||
qrcode==6.1 # QR codes for printed private URL sheets | ||
html2text==2019.8.11 # Compatibility with plain-text email clients | ||
|
||
# Django admin (Jet) | ||
# This is an unofficial fork of no-longer-maintained geex-arts/django-jet, | ||
# patched to support Django 3. | ||
git+https://github.com/Barukimang/[email protected] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
tabbycat/participants/migrations/0015_auto_20200614_1831.py
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@philipbelesky Just drawing attention to this line, which is the patched django-jet
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok. Also to address your comment above, we could always do a fork ourselves if we were concerned about it vanishing or having a breaking update.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, we could. I'd describe my concern as more about the consequence than the probability of it happening—I doubt it'll disappear, but if it does, Tabbycat will become undeployable until we release a patch with our own fork.