Zmiana wersji systemu operacyjnego w środowisku developerskim

.github/workflows/lint.yml

@@ -8,7 +8,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     env: 
-      PYTHON_VERSION: 3.8
+      PYTHON_VERSION: '3.10'
       NODE_VERSION: 12
     steps:
       - name: Checkout code

.github/workflows/test.yml

@@ -8,11 +8,11 @@ jobs:
   test:
     runs-on: ubuntu-latest
     env: 
-      PYTHON_VERSION: 3.8
+      PYTHON_VERSION: '3.10'
       NODE_VERSION: 12
     services:
       postgres:
-        image: postgres:12
+        image: postgres:14
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: fereolpass
@@ -35,6 +35,15 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
+      memcached:
+        image: memcached:1.6.14
+        ports:
+          - 11211:11211
+        options: >-
+          --health-cmd "memcached -h"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
 
     steps:
       - uses: actions/checkout@v2

Vagrantfile

@@ -7,7 +7,7 @@
 # you're doing.
 Vagrant.configure(2) do |config|
   config.ssh.shell = "bash"
-  config.vm.box = "ubuntu/focal64"
+  config.vm.box = "ubuntu/jammy64"
 
   # Installs ansible as it is not yet provided for focal.
   # https://github.com/ansible/ansible/issues/69203

infra/playbooks/dev/playbook.yml

@@ -11,6 +11,11 @@
     - name: Wait for any possibly running unattended upgrade to finish
       raw: systemd-run --property="After=apt-daily.service apt-daily-upgrade.service" --wait /bin/true
       become: yes
+
+    - name: Change permissions to /home/vagrant
+      ansible.builtin.file:
+        path: /home/vagrant
+        mode: "775"
 
     - name: Install yarn
       apt:
@@ -27,6 +32,19 @@
         - python3-pip
       become: yes
 
+    - name: Install Memcached
+      apt:
+        name: memcached
+        state: present
+      become: yes
+
+    - name: Ensure Memcached is running
+      service:
+        name: memcached
+        state: started
+        enabled: yes
+      become: yes
+
     - name: Install redis
       apt:
         name: redis-server

infra/playbooks/dev/postgres.yml

@@ -5,7 +5,7 @@
     APP_DB_USER: fereol
     APP_DB_PASS: fereolpass
     APP_DB_NAME: fereol
-    PG_VERSION: 12
+    PG_VERSION: 14
     PYTHON: "/home/vagrant/env3/bin/python3"
     ansible_python_interpreter: "/usr/bin/python3"
 

zapisy/apps/effects/apps.py

@@ -2,4 +2,4 @@
 
 
 class EffectsConfig(AppConfig):
-    name = 'effects'
+    name = 'apps.effects'

zapisy/apps/grade/poll/templates/poll/results.html

@@ -2,6 +2,10 @@
 {% load cache %}
 {% load render_bundle get_files from webpack_loader %}
 {% load filters %}
+{% block head_extra %}
+  <script src="https://cdn.bokeh.org/bokeh/release/bokeh-3.6.1.min.js"></script>
+  <link rel="stylesheet" href="https://cdn.bokeh.org/bokeh/release/bokeh-3.6.1.min.css">
+{% endblock head_extra %}
 
 {% block main-subtitle %}Wyniki oceny{% endblock %}
 {% block nav-grade-results %}active{% endblock %}
@@ -13,7 +17,7 @@
 
 {% block all-content %}
 
-{% render_bundle 'poll-bokeh-plotting' %}
+{% comment %} {% render_bundle 'poll-bokeh-plotting' %} {% endcomment %}
 
 <div class="row">
   <div class="col-lg-8 col-12">

zapisy/apps/grade/poll/utils.py

@@ -159,7 +159,7 @@ def plot(self):
             plot = bokeh.plotting.figure(
                 y_range=self._choices,
                 sizing_mode='scale_width',
-                plot_height=250,
+                height=250,
                 toolbar_location=None,
                 tools='',
             )

zapisy/apps/grade/poll/views.py

@@ -5,7 +5,8 @@
 from typing import List
 
 from django.contrib import messages
-from django.shortcuts import redirect, render, reverse
+from django.shortcuts import redirect, render
+from django.urls import reverse
 from django.views.generic import TemplateView, UpdateView, View
 
 from apps.enrollment.courses.models.semester import Semester

zapisy/apps/schedule/templates/schedule/base.html

@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-
 {% block events_active %} class="active"{% endblock %}
 
 {% block main-subtitle %}Rezerwacja Sal{% endblock %}
@@ -38,6 +37,4 @@
             <a class="nav-link" href="{% url 'events:events_report' %}">Raporty</a>
         </li>
     {% endif %}
-
-    {# end system_menu #}
 {% endblock %}

zapisy/apps/schedule/templates/schedule/reservations.html

@@ -1,7 +1,6 @@
 {% extends "schedule/base.html" %}
-{% load bootstrap_pagination %}
 {% load crispy_forms_tags %}
-
+{% load django_bootstrap5 %}
 {% block schedule_manage %} class="active"{% endblock %}
 
 {% block styles %}
@@ -32,7 +31,7 @@ <h2>{{ title }}</h2>
     {% endfor %}
 
     <div class="d-flex justify-content-center">
-        {% bootstrap_paginate qs range=10 show_first_last="true" %}
+        {% bootstrap_pagination qs %}
     </div>
 {% endblock %}
 

zapisy/package.json

@@ -11,7 +11,7 @@
     "pnp": true
   },
   "dependencies": {
-    "@bokeh/bokehjs": "2.4.3",
+    "@bokeh/bokehjs": "3.6.1",
     "@fullcalendar/bootstrap5": "5.11.5",
     "@fullcalendar/core": "5.11.5",
     "@fullcalendar/daygrid": "5.11.5",
@@ -75,7 +75,7 @@
     "vue-template-compiler": "2.7.14",
     "webpack": "4.47.0",
     "webpack-bundle-analyzer": "3.9.0",
-    "webpack-bundle-tracker": "0.4.3",
+    "webpack-bundle-tracker": "1.4.0",
     "webpack-cli": "3.3.12"
   }
 }

zapisy/requirements.common.txt

@@ -1,37 +1,41 @@
-Django==3.1.14
-django-bootstrap-pagination==1.7.1
+Django==4.2
+django-bootstrap5==24.1
 django-cas-ng==4.3.0
-django-crispy-forms==1.14.0
+django-crispy-forms==2.3
+crispy-bootstrap5==2024.10
 django-environ==0.9.0
-django-extensions==2.2.9
-django-filter==2.4.0
-django-mailer==1.2.6
-redis==3.5.3
-rq==1.14.1
+django-extensions==3.2.3
+django-filter==2.4.0 # Dostępna Wersja 24.3
+django-mailer==1.2.6 # Dostępna Wersja 2.3.2
+redis==3.5.3 # Dostępna Wersja 5.2.0
+rq==1.16.2 # Dostępna Wersja 2.0.0
 django-rq==2.8.1
-django-test-without-migrations==0.6
-django-webpack-loader==0.7.0
-djangorestframework==3.14.0
-django-pagedown==2.2.1
+django-test-without-migrations==0.6 # Ostatni update > 8 lat telmu
+django-webpack-loader==1.4.0 # Dostępna Wersja 3.1.1 ale nie jest kompatybilna z naszą wersją JS
+djangorestframework==3.15.1
+django-pagedown==2.2.1 ## Ostatni update 4 > lata temu
 
-ipdb==0.13.13
-prompt-toolkit==3.0.39
-ipython==7.34.0
-pycryptodome==3.19.0
-rollbar==0.16.3
-newrelic==5.24.0.153
+ipdb==0.13.13 # Ostatni update ponad rok temu
+prompt-toolkit==3.0.48
+ipython==7.34.0     # Dostępna Wersja 8.30.0
+pycryptodome==3.21.0
+rollbar==0.16.3      # Dostępna Wersja 1.1.0
+newrelic==5.24.0.153 # Dostępna Wersja 10.3.1
 gunicorn==20.1.0
-python-dateutil==2.8.2
-python-memcached==1.59
+python-dateutil==2.9.0.post0
+# python-memcached
+pymemcache==4.0.0 # python-memcached -> pymemcache django docs (python-memcached seems to be unmaintained)
 more-itertools==8.14.0
 xhtml2pdf==0.2.11
 # PyYAML is used for fixtures.
-pyyaml==5.4.1
+pyyaml==6.0.2
 # Bokeh - library used for plotting in views displaying Poll results
-bokeh==2.4.3
+bokeh==3.6.1
 
-gspread==3.7.0
+gspread==3.7.0 # Dostępna wersja 6.1.4
 typing-extensions==3.10.0.2
 oauth2client==4.1.3
 # We use html2text for one-off migration from HTML to markdown.
-html2text
+html2text==2024.2.26
+
+

zapisy/webpack_resources/webpack.config.js

@@ -102,7 +102,7 @@ const PLUGINS = [
     : false,
   new BundleTracker({
     path: path.resolve(STATS_DIR),
-    filename: "webpack-stats.json",
+    filename: "webpack_resources/webpack-stats.json",
   }),
 ].filter(Boolean);