Skip to content

Commit

Permalink
[COST-4516] Upgrade to Django 4.2 (#4893)
Browse files Browse the repository at this point in the history
* 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

Co-authored-by: Sam Doran <[email protected]>
  • Loading branch information
djnakabaale and samdoran committed Feb 14, 2024
1 parent 4f62011 commit e5287e9
Show file tree
Hide file tree
Showing 8 changed files with 67 additions and 150 deletions.
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ celery = ">=5.2.2"
ciso8601 = ">=2.1"
confluent-kafka = ">=2.1.0"
croniter = "*"
Django = "~=4.1.0"
Django = "~=4.2.0"
django-cors-headers = ">=3.1"
django-environ = ">=0.4"
django-extensions = ">=2.2"
Expand Down
Loading

0 comments on commit e5287e9

Please sign in to comment.