educommon 3.11.0__tar.gz → 3.11.2__tar.gz

{educommon-3.11.0/src/educommon.egg-info → educommon-3.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: educommon
-Version: 3.11.0
+Version: 3.11.2
 Summary: Общая кодовая база для проектов БЦ Образование
 Home-page: https://stash.bars-open.ru/projects/EDUBASE/repos/educommon
 Author: BARS Group
@@ -20,7 +20,7 @@ Classifier: Framework :: Django :: 3.0
 Classifier: Framework :: Django :: 3.1
 Classifier: Framework :: Django :: 3.2
 Requires-Dist: packaging<24,>=21.3
-Requires-Dist: Django<4,>=2.2
+Requires-Dist: Django<4,>=3.1
 Requires-Dist: django-mptt
 Requires-Dist: python-dateutil
 Requires-Dist: termcolor
@@ -39,3 +39,9 @@ Requires-Dist: m3-simple-report<2,>=1.4.1
 Requires-Dist: m3-spyne-smev<2,>=0.2.4
 Requires-Dist: python-magic==0.4.15
 Requires-Dist: distro<2,>=1.3.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: summary

{educommon-3.11.0 → educommon-3.11.2}/setup.py

@@ -49,7 +49,7 @@ def main():
         ),
         install_requires=(
             'packaging>=21.3,<24',
-            'Django>=2.2,<4',
+            'Django>=3.1,<4',
             'django-mptt',
             'python-dateutil',
             'termcolor',

educommon-3.11.2/src/educommon/async_task/migrations/0003_alter_runningtask_options.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.23 on 2025-02-04 13:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('async_task', '0002_task_type_and_status_data'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='runningtask',
+            name='options',
+            field=models.JSONField(blank=True, null=True, verbose_name='Дополнительные опции задачи'),
+        ),
+    ]

{educommon-3.11.0 → educommon-3.11.2}/src/educommon/async_task/models.py

@@ -9,9 +9,6 @@ from celery import (
 from django.contrib.contenttypes.models import (
     ContentType,
 )
-from django.contrib.postgres.fields import (
-    JSONField,
-)
 from django.db.models import (
     PROTECT,
     SET_NULL,
@@ -22,6 +19,7 @@ from django.db.models import (
     Index,
     PositiveIntegerField,
     UUIDField,
+    JSONField,
 )
 from m3.db import (
     BaseObjectModel,

{educommon-3.11.0 → educommon-3.11.2}/src/educommon/utils/misc.py

@@ -127,12 +127,23 @@ def message_to_sentry(message=None, extra=None, tag=None, level=logging.INFO):
     В параметре tag можно отправить тег для последующего поиска в Sentry
     """
     if getattr(settings, 'SENTRY_DSN', None):
-        from raven.contrib.django.raven_compat.models import (
-            client as sentry_client,
-        )
-        sentry_client.captureMessage(
-            message=message,
-            data={'level': level},
-            extra=extra,
-            tags={'tags': tag} if tag else None
-        )
+        if getattr(settings, 'USE_SENTRY_SDK', None):
+            from sentry_sdk import (
+                capture_message,
+            )
+            capture_message(
+                message=message,
+                level=level,
+                extras=extra,
+                tags={'tags': tag} if tag else None
+            )
+        else:
+            from raven.contrib.django.raven_compat.models import (
+                client as sentry_client,
+            )
+            sentry_client.captureMessage(
+                message=message,
+                data={'level': level},
+                extra=extra,
+                tags={'tags': tag} if tag else None
+            )

{educommon-3.11.0 → educommon-3.11.2}/src/educommon/utils/ui.py

@@ -4,6 +4,7 @@ import os
 from datetime import (
     datetime,
     time,
+    date,
 )
 
 from django.conf import (
@@ -243,6 +244,8 @@ class DatetimeFilterCreator:
     Поддерживает значения по умолчанию.
     """
 
+    MIN_VALUE_DATE = date(1917, 1, 1)
+
     def __init__(self, model, field_name,
                  get_from=lambda: None, get_to=lambda: None):
         """Фильтр по интервалу для datetime поля.
@@ -281,7 +284,8 @@ class DatetimeFilterCreator:
                 self.model,
                 model_register=observer,
                 control_creator=lambda: ext.ExtDateField(
-                    value=self.defaults['from']()
+                    value=self.defaults['from'](),
+                    min_value=self.__class__.MIN_VALUE_DATE,
                 ),
                 field_name=self.field_name,
                 lookup=lambda dt: Q(**{
@@ -292,7 +296,8 @@ class DatetimeFilterCreator:
                 self.model,
                 model_register=observer,
                 control_creator=lambda: ext.ExtDateField(
-                    value=self.defaults['to']()
+                    value=self.defaults['to'](),
+                    min_value=self.__class__.MIN_VALUE_DATE,
                 ),
                 field_name=self.field_name,
                 lookup=lambda dt: Q(**{

{educommon-3.11.0 → educommon-3.11.2}/src/educommon/version.conf

@@ -4,8 +4,8 @@
 # нормальной установки обновлений.
 
 [version]
-BRANCH = tags/3.11.0
-VERSION = 3.11.0
-REVISION = f55e33a2f910df4cd73e441a843b681a481919bc
-VERSION_DATE = 25.09.2024
-REVISION_DATE = 25.09.2024
+BRANCH = tags/3.11.2
+VERSION = 3.11.2
+REVISION = 7472df222cb4d77b8e2220554691e392ca729eca
+VERSION_DATE = 21.02.2025
+REVISION_DATE = 21.02.2025

{educommon-3.11.0 → educommon-3.11.2/src/educommon.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: educommon
-Version: 3.11.0
+Version: 3.11.2
 Summary: Общая кодовая база для проектов БЦ Образование
 Home-page: https://stash.bars-open.ru/projects/EDUBASE/repos/educommon
 Author: BARS Group
@@ -20,7 +20,7 @@ Classifier: Framework :: Django :: 3.0
 Classifier: Framework :: Django :: 3.1
 Classifier: Framework :: Django :: 3.2
 Requires-Dist: packaging<24,>=21.3
-Requires-Dist: Django<4,>=2.2
+Requires-Dist: Django<4,>=3.1
 Requires-Dist: django-mptt
 Requires-Dist: python-dateutil
 Requires-Dist: termcolor
@@ -39,3 +39,9 @@ Requires-Dist: m3-simple-report<2,>=1.4.1
 Requires-Dist: m3-spyne-smev<2,>=0.2.4
 Requires-Dist: python-magic==0.4.15
 Requires-Dist: distro<2,>=1.3.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: summary

{educommon-3.11.0 → educommon-3.11.2}/src/educommon.egg-info/SOURCES.txt

@@ -34,6 +34,7 @@ src/educommon/async_task/tasks.py
 src/educommon/async_task/ui.py
 src/educommon/async_task/migrations/0001_initial.py
 src/educommon/async_task/migrations/0002_task_type_and_status_data.py
+src/educommon/async_task/migrations/0003_alter_runningtask_options.py
 src/educommon/async_task/migrations/__init__.py
 src/educommon/async_task/templates/ui-js/async-task-list-win.js
 src/educommon/async_task/templates/ui-js/async-task-revoke.js

{educommon-3.11.0 → educommon-3.11.2}/src/educommon.egg-info/requires.txt

@@ -1,5 +1,5 @@
 packaging<24,>=21.3
-Django<4,>=2.2
+Django<4,>=3.1
 django-mptt
 python-dateutil
 termcolor