Skip to content

Commit f757eed

Browse files
stopnoanimeIteron-devreivvaxkamilszymczak1github-actions[bot]
authored
Feature/django 5 migration (#5)
* Fix: Use `line.fields|length` in fieldset.html and change GET to POST in test_invalidated_user_logout * Fix: Change `pytest.mark.optionalhook` to `pytest.hookimpl(optionalhook=True)` * Fix: Django deprecations (DEFAULT_FILE_STORAGE, index_together) * Bump django-compressor from `>=4.3,<4.4` to `>=4.5,<4.6` * Bump django-mptt from `>=0.14,<0.15` to `>=0.16,<0.17` and update postgres to 14.17 * Fix: `Model instances passed to related filters must be saved` error in models.py * Fix: Remove `filter_horizontal` in BaseTagAdmin and bump django to 5.1.7 * Fix: Django deprecation (log_deletion, log_actions) * Fix: test_can_change_login_from_invalid and test_login_cannot_change_from_valid * Ordering of DifficultyTags (sio2project#449) * Add ordering for DifficultyTag and DiffultyTagLocalization * Make migrations * Update migrations * Fix: Add `unlocalize` to progress percentage in task-archive-problemgroup.html * Refactor: Remove redundant `USE_L10N` in default_settings.py (due django deprecation) * Add a note about copying limits (sio2project#480) * Add a note about copying limits * Add text translation * Github Actions - Downloaded translations. (sio2project#495) Co-authored-by: SIO2 Automatic Agent <[email protected]> * add buttons to expand group member lists (sio2project#493) * Fix: Move `DATETIME_FORMAT` to custom format files * Fix: `TypeError: cannot pickle 'generator' object` error * Fix: Replace LogoutView with logout() in `not_anonymous` function * Fix: TestsSelectionForm * Fix: Add `request` lookup_allowed() (django deprecation) * Fix: Add missing migrations (due to index_together deprecation) * Searchbox bugfix (sio2project#489) * Now if tags don't show up in probset, only superusers can filter by them. * Fix bug allowing for duplicate difficulty search tags. * Fix bug in filtering by difficulty tags. * PARTIAL fix to tests in TestProblemSearchHintsTags. * Hide tags under searchbox and tag search hints when PROBLEM_TAGS_VISIBLE = False (even for admin). * Fix more tag hint tests. * Fix all but one test from TestProblemSearch. * Remove temporary comment. * Override setting globally for TestProblemSearchHintsTags. * Override settings globally for TestProblemSearchOrigin. * Add setting override to test_statistics_sorting_with_query. * Fix column number in test_statistics_sorting_with_query. * Fix the column number being ordered by in test_problem_statistics.py. * Better problem column array naming in TestProblemStatisticsDisplay. * Rename problem 'Znacznik' in test_problem_search.json to 'Znacznik_zadanie', as 'Tags' are localised in Polish to 'Znaczniki' which caused false positives when checking if the task appeared in URL. * Rename 'Znacznik_zadanie' to 'Znaczn1k', as its previous name still caused name collisions. * fix minor bugs in usergroups app and add tests (sio2project#498) * first commit * fix permissions * fix admin panel not saving * small fixes * fix origin info * change permission name * fix permissions for contest admins * fix permissions for contest admins * fix for problems without contests * add test * resolve conflicts * small fix * test tags tab * squash migrations * remove redundant migrations * display nickname next to the full name when displaying contest pupils * add logic and use member.username * fix more similar cases * fix order of names * more elegant code * more elegant code * revert changes * more elegant code * add buttons to expand group member lists * fix minor bugs * add tests * Fix: Migrations due `index_together` deprecation * Bump django from `5.1.7` to `o>=5.2,<5.3` * Refactor: Use admin decorators and replace `re_path` with `path` (assisted by `django-upgrade` tool) * Refactor: Remove redundant comment from setup.py * Docs: Adapt to Django 5.2 * Bump the minimum version of `pytest-django` to `4.11`, and update `django-nested-admin` to `>=4.1,<4.2` --------- Co-authored-by: Iteron-dev <[email protected]> Co-authored-by: reivvax <[email protected]> Co-authored-by: Kamil Szymczak <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: SIO2 Automatic Agent <[email protected]> Co-authored-by: Atanazy Gawrysiak <[email protected]> Co-authored-by: Grzegorz Franciszek Krawczyk <[email protected]>
1 parent 639501b commit f757eed

File tree

116 files changed

+1947
-980
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+1947
-980
lines changed

conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ def pytest_collection_modifyitems(config, items):
2929

3030

3131
# Removing links column from html report
32-
@pytest.mark.optionalhook
32+
@pytest.hookimpl(optionalhook=True)
3333
def pytest_html_results_table_header(cells):
3434
cells.pop()
3535

3636

3737
# Removing links column from html report
38-
@pytest.mark.optionalhook
38+
@pytest.hookimpl(optionalhook=True)
3939
def pytest_html_results_table_row(report, cells):
4040
cells.pop()

docker-compose-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ x-common-envs: &common-envs
55

66
services:
77
db:
8-
image: library/postgres:12.2
8+
image: library/postgres:14.17
99
environment:
1010
POSTGRES_USER: "oioioi"
1111
POSTGRES_PASSWORD: "password"

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ x-common-envs: &common-envs
55

66
services:
77
db:
8-
image: library/postgres:12.2
8+
image: library/postgres:14.17
99
environment:
1010
POSTGRES_USER: "oioioi"
1111
POSTGRES_PASSWORD: "password"

0 commit comments

Comments
 (0)