Merge branch 'master' into notifications-python

Author: stopnoanime

.github/workflows/cypress.yml

@@ -13,7 +13,7 @@ jobs:
     timeout-minutes: 60
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install `easy_toolbox.py` requirements
         run: |
           python -m pip install --upgrade pip

.github/workflows/doc.yml

@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.11'
 
     - name: Install apt dependencies
       run: |

.github/workflows/nightly.yml

@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.11'
 
     - name: Install apt dependencies
       run: |

.github/workflows/pytest.yml

@@ -13,11 +13,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.11'
 
     - name: Install apt dependencies
       run: |

.github/workflows/translations-download.yml

@@ -16,11 +16,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.11'
 
     - name: Install apt dependencies
       run: |

.github/workflows/translations-upload.yml

@@ -16,11 +16,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.11'
 
     - name: Install apt dependencies
       run: |

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10 AS base
+FROM python:3.11 AS base
 
 ENV PYTHONUNBUFFERED 1
 
@@ -56,7 +56,7 @@ USER oioioi
 ENV PATH $PATH:/home/oioioi/.local/bin/
 
 ENV BERKELEYDB_DIR /usr
-RUN pip3 install --user psycopg2-binary==2.8.6 twisted uwsgi
+RUN pip3 install --user psycopg2-binary==2.9.5 twisted uwsgi
 RUN pip3 install --user bsddb3==6.2.7
 
 WORKDIR /sio2/oioioi
@@ -75,7 +75,7 @@ WORKDIR /sio2/deployment
 RUN mkdir -p /sio2/deployment/logs/{supervisor,runserver}
 
 # The stage below is independent of base and can be built in parallel to optimize build time.
-FROM python:3.10 AS development-sandboxes
+FROM python:3.11 AS development-sandboxes
 
 ENV DOWNLOAD_DIR=/sio2/sandboxes
 ENV MANIFEST_URL=https://downloads.sio2project.mimuw.edu.pl/sandboxes/Manifest

UPGRADING.rst

@@ -12,6 +12,35 @@ Then run::
 
 and restart the judging machines.
 
+Fast Django Migration to 5.2 (Important for Large OIOIOI Instances)
+-----------------------------------
+
+The following migrations require removing an index (created by the deprecated ``index_together``) and creating a new one:
+
+* ``oi/migrations/0008_sync_indexes_state.py``
+* ``forum/migrations/0013_sync_indexes_state.py``
+* ``contests/migrations/0021_sync_indexes_state.py``
+
+Since dropping and then creating an index takes a long time for instances with a very large number of submissions, you can speed this up as follows:
+
+Because these indexes are in the database schema, you should mark these migrations (``0008_sync_indexes_state.py``, ``0021_sync_indexes_state.py``, ``0013_sync_indexes_state.py``) as fake.
+See the `django docs <https://docs.djangoproject.com/en/5.2/ref/django-admin/#cmdoption-migrate-fake>`_ for details.
+Then, rename the existing indexes created by ``IndexTogether`` to the corresponding names specified in these migrations.
+You can manually identify the indexes by checking which two fields they cover.
+
+For example, an index named ``forum_post_thread_id_add_date_6d8ec21d_idx`` should be renamed to ``forum_post_thread__54acb8_idx``.
+Similarly, rename the other indexes so that the database state is correct, i.e., the database contains indexes with the names specified in the migrations.
+
+After these steps, you will achieve a consistent database state without waiting a long time for the migrations to complete.
+
+::
+
+    python manage.py migrate oi 0008 --fake
+
+    python manage.py migrate forum 0021 --fake
+
+    python manage.py migrate contests 0013 --fake
+
 Changes in the deployment directory
 -----------------------------------
 

conftest.py

@@ -4,12 +4,15 @@
 
 from oioioi.base.tests import pytest_plugin as base_plugin
 from oioioi.contests.tests import pytest_plugin as contests_plugin
+from django.conf import settings
 
 
 def pytest_addoption(parser):
     parser.addoption(
         '--runslow', action='store_true', default=False, help="run slow tests"
     )
+    parser.addoption(
+        '--strict-template-vars', action='store_true', help="Raise errors for undefined template variables")
 
 
 # called for running each test
@@ -18,6 +21,12 @@ def pytest_runtest_setup(item):
     base_plugin.pytest_runtest_setup(item)
 
 
+def pytest_configure(config):
+    if config.getoption("--strict-template-vars"):
+        # this will raise an error if a template variable is not defined
+        settings.TEMPLATES[0]['OPTIONS']['string_if_invalid'] = '{% templatetag openvariable %} INVALID_VAR: %s {% templatetag closevariable %}'
+        
+
 def pytest_collection_modifyitems(config, items):
     # --runslow flag: do not skip slow tests
     if config.getoption('--runslow', False):
@@ -29,12 +38,12 @@ def pytest_collection_modifyitems(config, items):
 
 
 # Removing links column from html report
-@pytest.mark.optionalhook
+@pytest.hookimpl(optionalhook=True)
 def pytest_html_results_table_header(cells):
     cells.pop()
 
 
 # Removing links column from html report
-@pytest.mark.optionalhook
+@pytest.hookimpl(optionalhook=True)
 def pytest_html_results_table_row(report, cells):
     cells.pop()

docker-compose-dev.yml

@@ -5,7 +5,7 @@ x-common-envs: &common-envs
 
 services:
   db:
-    image: library/postgres:12.2
+    image: library/postgres:14.17
     environment:
       POSTGRES_USER: "oioioi"
       POSTGRES_PASSWORD: "password"

docker-compose.yml

@@ -5,7 +5,7 @@ x-common-envs: &common-envs
 
 services:
   db:
-    image: library/postgres:12.2
+    image: library/postgres:14.17
     environment:
       POSTGRES_USER: "oioioi"
       POSTGRES_PASSWORD: "password"