[COST-4515] Upgrade to Django 4.1 #4853
Merged
Conversation
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
djnakabaale
added
the
smoke-tests
samdoran
force-pushed
the
cost-4515-django-4.1
branch
from
c1543b4
to
02c86cf
Compare
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## cost-2231-django-4 #4853 +/- ##
==================================================
Coverage 93.9% 94.0%
==================================================
Files 370 370
Lines 30573 30565 -8
Branches 3648 3645 -3
==================================================
+ Hits 28716 28718 +2
+ Misses 1197 1187 -10
Partials 660 660 |
samdoran
force-pushed
the
cost-4515-django-4.1
branch
from
f393467
to
e20a98e
Compare
samdoran
force-pushed
the
cost-2231-django-4
branch
from
71fdb6a
to
4cbc58a
Compare
samdoran
force-pushed
the
cost-4515-django-4.1
branch
2 times, most recently
from
39d0dd9
to
9991fad
Compare
samdoran
force-pushed
the
cost-2231-django-4
branch
from
4cbc58a
to
6e2f83d
Compare
maskarb
reviewed
Feb 1, 2024
samdoran
force-pushed
the
cost-2231-django-4
branch
from
6e2f83d
to
2aead84
Compare
This assert statement will always fail since the template schema does not yet exists. This test will only pass if another test runs before this test creates the template schema.
Do not define a custom sequence object since that is no longer required with the move to identity columns. Co-authored-by: Michael Skarbek <mskarbek@redhat.com> Co-authored-by: David Nakabaale <dnakabaa@redhat.com>
We may not end up wanting this to be so automatic, but this is a good way to handle it if needed. The only problem is getting the hash is a bit clunky since the contents of clone_schema.sql do not exactly match the function definition once it is stored in the database. I added the hash output to logs in order to make updating the hash easier.
samdoran
force-pushed
the
cost-2231-django-4
branch
from
2aead84
to
c382291
Compare
samdoran
force-pushed
the
cost-4515-django-4.1
branch
2 times, most recently
from
f3c643f
to
bcc7e39
Compare
Do not define a custom sequence object since that is no longer required with the move to identity columns. Co-authored-by: Michael Skarbek <mskarbek@redhat.com> Co-authored-by: David Nakabaale <dnakabaa@redhat.com>
Add correct copyright and license information to management command. Create project level licenses to reflect the use of multiple licenses within the project.
- Use SQL composition rather than format strings to protect against SQL injection attacks. The risk is quite low, but it’s best to just do the right thing. - Reorganize the code to avoid a nested function definiton and an unnecessary global variable that only needed to be local.
samdoran
force-pushed
the
cost-4515-django-4.1
branch
from
bcc7e39
to
457fb3a
Compare
samdoran
approved these changes
Feb 2, 2024
|
3 tasks
samdoran
added a commit
that referenced
this pull request
Feb 9, 2024
* upgrade to Django 4.1 * Update deprecated ‘warn’ method * Remove deprecated test case method * Remove deprecated Series.bool method * Correct docstring and class attribute name * Cleanup file handle * Fix flaky test This assert statement will always fail since the template schema does not yet exists. This test will only pass if another test runs before this test creates the template schema. * Update clone_schema.sql Do not define a custom sequence object since that is no longer required with the move to identity columns. Co-authored-by: Michael Skarbek <mskarbek@redhat.com> Co-authored-by: David Nakabaale <dnakabaa@redhat.com> * Update clone_schema SQL function when necessary We may not end up wanting this to be so automatic, but this is a good way to handle it if needed. The only problem is getting the hash is a bit clunky since the contents of clone_schema.sql do not exactly match the function definition once it is stored in the database. I added the hash output to logs in order to make updating the hash easier. * Avoid unnecessary globals * update comments in clone_schema func * Update clone_schema hash * add management cmd to migrate serial cols * Update clone_schema.sql Do not define a custom sequence object since that is no longer required with the move to identity columns. Co-authored-by: Michael Skarbek <mskarbek@redhat.com> Co-authored-by: David Nakabaale <dnakabaa@redhat.com> * Update license information Add correct copyright and license information to management command. Create project level licenses to reflect the use of multiple licenses within the project. * Improvements to serial to identity management command - Use SQL composition rather than format strings to protect against SQL injection attacks. The risk is quite low, but it’s best to just do the right thing. - Reorganize the code to avoid a nested function definiton and an unnecessary global variable that only needed to be local. * Do not update clone_schema function automatically * Add migration to update clone_schema function * fixup! Improvements to serial to identity management command --------- Co-authored-by: Sam Doran <sdoran@redhat.com> Co-authored-by: Michael Skarbek <mskarbek@redhat.com>
samdoran
added a commit
that referenced
this pull request
Feb 12, 2024
* upgrade to Django 4.1 * Update deprecated ‘warn’ method * Remove deprecated test case method * Remove deprecated Series.bool method * Correct docstring and class attribute name * Cleanup file handle * Fix flaky test This assert statement will always fail since the template schema does not yet exists. This test will only pass if another test runs before this test creates the template schema. * Update clone_schema.sql Do not define a custom sequence object since that is no longer required with the move to identity columns. Co-authored-by: Michael Skarbek <mskarbek@redhat.com> Co-authored-by: David Nakabaale <dnakabaa@redhat.com> * Update clone_schema SQL function when necessary We may not end up wanting this to be so automatic, but this is a good way to handle it if needed. The only problem is getting the hash is a bit clunky since the contents of clone_schema.sql do not exactly match the function definition once it is stored in the database. I added the hash output to logs in order to make updating the hash easier. * Avoid unnecessary globals * update comments in clone_schema func * Update clone_schema hash * add management cmd to migrate serial cols * Update clone_schema.sql Do not define a custom sequence object since that is no longer required with the move to identity columns. Co-authored-by: Michael Skarbek <mskarbek@redhat.com> Co-authored-by: David Nakabaale <dnakabaa@redhat.com> * Update license information Add correct copyright and license information to management command. Create project level licenses to reflect the use of multiple licenses within the project. * Improvements to serial to identity management command - Use SQL composition rather than format strings to protect against SQL injection attacks. The risk is quite low, but it’s best to just do the right thing. - Reorganize the code to avoid a nested function definiton and an unnecessary global variable that only needed to be local. * Do not update clone_schema function automatically * Add migration to update clone_schema function * fixup! Improvements to serial to identity management command --------- Co-authored-by: Sam Doran <sdoran@redhat.com> Co-authored-by: Michael Skarbek <mskarbek@redhat.com>
samdoran
added a commit
that referenced
this pull request
Feb 13, 2024
* upgrade to Django 4.1 * Update deprecated ‘warn’ method * Remove deprecated test case method * Remove deprecated Series.bool method * Correct docstring and class attribute name * Cleanup file handle * Fix flaky test This assert statement will always fail since the template schema does not yet exists. This test will only pass if another test runs before this test creates the template schema. * Update clone_schema.sql Do not define a custom sequence object since that is no longer required with the move to identity columns. Co-authored-by: Michael Skarbek <mskarbek@redhat.com> Co-authored-by: David Nakabaale <dnakabaa@redhat.com> * Update clone_schema SQL function when necessary We may not end up wanting this to be so automatic, but this is a good way to handle it if needed. The only problem is getting the hash is a bit clunky since the contents of clone_schema.sql do not exactly match the function definition once it is stored in the database. I added the hash output to logs in order to make updating the hash easier. * Avoid unnecessary globals * update comments in clone_schema func * Update clone_schema hash * add management cmd to migrate serial cols * Update clone_schema.sql Do not define a custom sequence object since that is no longer required with the move to identity columns. Co-authored-by: Michael Skarbek <mskarbek@redhat.com> Co-authored-by: David Nakabaale <dnakabaa@redhat.com> * Update license information Add correct copyright and license information to management command. Create project level licenses to reflect the use of multiple licenses within the project. * Improvements to serial to identity management command - Use SQL composition rather than format strings to protect against SQL injection attacks. The risk is quite low, but it’s best to just do the right thing. - Reorganize the code to avoid a nested function definiton and an unnecessary global variable that only needed to be local. * Do not update clone_schema function automatically * Add migration to update clone_schema function * fixup! Improvements to serial to identity management command --------- Co-authored-by: Sam Doran <sdoran@redhat.com> Co-authored-by: Michael Skarbek <mskarbek@redhat.com>
samdoran
added a commit
that referenced
this pull request
Feb 13, 2024
* upgrade to Django 4.1 * Update deprecated ‘warn’ method * Remove deprecated test case method * Remove deprecated Series.bool method * Correct docstring and class attribute name * Cleanup file handle * Fix flaky test This assert statement will always fail since the template schema does not yet exists. This test will only pass if another test runs before this test creates the template schema. * Update clone_schema.sql Do not define a custom sequence object since that is no longer required with the move to identity columns. Co-authored-by: Michael Skarbek <mskarbek@redhat.com> Co-authored-by: David Nakabaale <dnakabaa@redhat.com> * Update clone_schema SQL function when necessary We may not end up wanting this to be so automatic, but this is a good way to handle it if needed. The only problem is getting the hash is a bit clunky since the contents of clone_schema.sql do not exactly match the function definition once it is stored in the database. I added the hash output to logs in order to make updating the hash easier. * Avoid unnecessary globals * update comments in clone_schema func * Update clone_schema hash * add management cmd to migrate serial cols * Update clone_schema.sql Do not define a custom sequence object since that is no longer required with the move to identity columns. Co-authored-by: Michael Skarbek <mskarbek@redhat.com> Co-authored-by: David Nakabaale <dnakabaa@redhat.com> * Update license information Add correct copyright and license information to management command. Create project level licenses to reflect the use of multiple licenses within the project. * Improvements to serial to identity management command - Use SQL composition rather than format strings to protect against SQL injection attacks. The risk is quite low, but it’s best to just do the right thing. - Reorganize the code to avoid a nested function definiton and an unnecessary global variable that only needed to be local. * Do not update clone_schema function automatically * Add migration to update clone_schema function * fixup! Improvements to serial to identity management command --------- Co-authored-by: Sam Doran <sdoran@redhat.com> Co-authored-by: Michael Skarbek <mskarbek@redhat.com>
samdoran
added a commit
that referenced
this pull request
Feb 14, 2024
* upgrade to Django 4.1 * Update deprecated ‘warn’ method * Remove deprecated test case method * Remove deprecated Series.bool method * Correct docstring and class attribute name * Cleanup file handle * Fix flaky test This assert statement will always fail since the template schema does not yet exists. This test will only pass if another test runs before this test creates the template schema. * Update clone_schema.sql Do not define a custom sequence object since that is no longer required with the move to identity columns. Co-authored-by: Michael Skarbek <mskarbek@redhat.com> Co-authored-by: David Nakabaale <dnakabaa@redhat.com> * Update clone_schema SQL function when necessary We may not end up wanting this to be so automatic, but this is a good way to handle it if needed. The only problem is getting the hash is a bit clunky since the contents of clone_schema.sql do not exactly match the function definition once it is stored in the database. I added the hash output to logs in order to make updating the hash easier. * Avoid unnecessary globals * update comments in clone_schema func * Update clone_schema hash * add management cmd to migrate serial cols * Update clone_schema.sql Do not define a custom sequence object since that is no longer required with the move to identity columns. Co-authored-by: Michael Skarbek <mskarbek@redhat.com> Co-authored-by: David Nakabaale <dnakabaa@redhat.com> * Update license information Add correct copyright and license information to management command. Create project level licenses to reflect the use of multiple licenses within the project. * Improvements to serial to identity management command - Use SQL composition rather than format strings to protect against SQL injection attacks. The risk is quite low, but it’s best to just do the right thing. - Reorganize the code to avoid a nested function definiton and an unnecessary global variable that only needed to be local. * Do not update clone_schema function automatically * Add migration to update clone_schema function * fixup! Improvements to serial to identity management command --------- Co-authored-by: Sam Doran <sdoran@redhat.com> Co-authored-by: Michael Skarbek <mskarbek@redhat.com>
samdoran
added a commit
that referenced
this pull request
Feb 15, 2024
* Update deprecated ‘warn’ method * Remove deprecated test case method * Remove deprecated Series.bool method * Correct docstring and class attribute name * Cleanup file handle * Fix flaky test This assert statement will always fail since the template schema does not yet exists. This test will only pass if another test runs before this test creates the template schema. * Update clone_schema.sql Do not define a custom sequence object since that is no longer required with the move to identity columns. Do not define a custom sequence object since that is no longer required with the move to identity columns. * Avoid unnecessary globals * Add management command to migrate serial ID columns to identity * Update license information Add correct copyright and license information to management command. Create project level licenses to reflect the use of multiple licenses within the project. * Improvements to serial to identity management command Use SQL composition rather than format strings to protect against SQL injection attacks. The risk is quite low, but it’s best to just do the right thing. Reorganize the code to avoid a nested function definiton and an unnecessary global variable that only needed to be local. * Add migration to update clone_schema function --------- Co-authored-by: Sam Doran <sdoran@redhat.com> Co-authored-by: Michael Skarbek <mskarbek@redhat.com> Co-authored-by: David Nakabaale <dnakabaa@redhat.com>
samdoran
added a commit
that referenced
this pull request
Feb 16, 2024
* Update deprecated ‘warn’ method * Remove deprecated test case method * Remove deprecated Series.bool method * Correct docstring and class attribute name * Cleanup file handle * Fix flaky test This assert statement will always fail since the template schema does not yet exists. This test will only pass if another test runs before this test creates the template schema. * Update clone_schema.sql Do not define a custom sequence object since that is no longer required with the move to identity columns. Do not define a custom sequence object since that is no longer required with the move to identity columns. * Avoid unnecessary globals * Add management command to migrate serial ID columns to identity * Update license information Add correct copyright and license information to management command. Create project level licenses to reflect the use of multiple licenses within the project. * Improvements to serial to identity management command Use SQL composition rather than format strings to protect against SQL injection attacks. The risk is quite low, but it’s best to just do the right thing. Reorganize the code to avoid a nested function definiton and an unnecessary global variable that only needed to be local. * Add migration to update clone_schema function --------- Co-authored-by: Sam Doran <sdoran@redhat.com> Co-authored-by: Michael Skarbek <mskarbek@redhat.com> Co-authored-by: David Nakabaale <dnakabaa@redhat.com>
samdoran
pushed a commit
that referenced
this pull request
Feb 19, 2024
The upgrade from Django 3.2 → 4.2 was done in stages Upgrade to Django 4.0 (#4839) - Remove gettext alias - Mocks for get_response required by middlewaremixin - Use method_decorator to apply neevr_cache on class method - Method set_context deprecated in DRF 3.12 in favor of requires_context - User Django RedisCache and remove django_redis library Upgrade to Django 4.1 (#4853) - Update deprecated ‘warn’ method - Remove deprecated test case method - Remove deprecated Series.bool method - Correct docstring and class attribute name - Cleanup file handle - Fix flaky test This assert statement will always fail since the template schema does not yet exists. This test will only pass if another test runs before this test creates the template schema. - Update clone_schema.sql Do not define a custom sequence object since that is no longer required with the move to identity columns. Do not define a custom sequence object since that is no longer required with the move to identity columns. - Avoid unnecessary globals - Add management command to migrate serial ID columns to identity - Update license information Add correct copyright and license information to management command. Create project level licenses to reflect the use of multiple licenses within the project. - Improvements to serial to identity management command Use SQL composition rather than format strings to protect against SQL injection attacks. The risk is quite low, but it’s best to just do the right thing. Reorganize the code to avoid a nested function definiton and an unnecessary global variable that only needed to be local. - Add migration to update clone_schema function Upgrade to Django 4.2 (#4893) - Clean up unittest test_execute_query_with_group_by_tag_and_limit - Move Window after aggregation in group_by annotation Since the Window is used only to provide row numbers and there is no additional filtering done on the data in the Window, moving it after the ArrayAgg fixes the error encountered in Django 4.2 and returns the same data in the same order. - Check correct log level in test This works in Python 3.9 due to a bug in unittest. - Use test database name from settings instead of hard coding it - Use consistent name for test database - Correct patching in test - Update clone_schema function in managament command - Stop using deprecated .bool() method https://pandas.pydata.org/docs/reference/api/pandas.DataFrame.bool.html - Explicitly set the test database name Currently we are relying on Django’s internal test setup to add a `test_` prefix to the default database name. This works fine most of the time but it’s better to be explicit. - Use method call instead of operator This prevents tripping up flake8 and the need for an ignore or parenthesis - Reduce to a final boolean value https://pandas.pydata.org/pandas-docs/stable/user_guide/basics.html#boolean-reductions - Remove migration that updates clone_schema SQL function Handling this exclusively with the migrate_serial_to_identity_columns management command - Move to STORAGES from deprecated options - Remove deprecated L10_N setting --------- Co-authored-by: Michael Skarbek <mskarbek@redhat.com> Co-authored-by: David Nakabaale <dnakabaa@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Jira Ticket
COST-4515
Description
This change will upgrade Django version from 4.0.x to 4.1.x.
Testing
Notes
...