edu-rdm-integration 2.0.2__py3-none-any.whl → 2.1.0__py3-none-any.whl

edu_rdm_integration/collect_data/base/runners.py

@@ -32,9 +32,10 @@ class BaseCollectingDataRunner(WebEduRunner):
         )
 
         for chunk_index, raw_logs_chunk in enumerate(raw_logs_chunks, start=1):
+            raw_logs = list(raw_logs_chunk)
             for runnable_class in self._prepare_runnable_classes():
                 runnable = runnable_class(
-                    raw_logs=list(raw_logs_chunk),
+                    raw_logs=raw_logs,
                     chunk_index=chunk_index,
                     *args,
                     **kwargs,

edu_rdm_integration/collect_data/helpers.py

@@ -6,7 +6,6 @@ from datetime import (
 )
 from typing import (
     Dict,
-    Optional,
 )
 
 from django.conf import (

edu_rdm_integration/collect_data/tests.py

@@ -6,7 +6,6 @@ from typing import (
     Any,
     Dict,
     Optional,
-    Tuple,
     Type,
 )
 from unittest import (

edu_rdm_integration/enum_register/mixins.py

@@ -8,9 +8,6 @@ from typing import (
 from django.db import (
     models,
 )
-from django.utils.decorators import (
-    classproperty,
-)
 
 from m3_db_utils.mixins import (
     BaseEnumRegisterMixin,
@@ -18,6 +15,9 @@ from m3_db_utils.mixins import (
 from m3_db_utils.models import (
     ModelEnumValue,
 )
+from m3_django_compat import (
+    classproperty,
+)
 
 from edu_rdm_integration.models import (
     RegionalDataMartEntityEnum,
@@ -35,11 +35,11 @@ class EntityEnumRegisterMixin(BaseEnumRegisterMixin):
     """Модель-перечисление в которую регистрируется сущность."""
 
     main_model_enum: ModelEnumValue
-    """Значение RegionalDataMartModelEnum, 
+    """Значение RegionalDataMartModelEnum,
     основной модели РВД для формирования сущности."""
 
     additional_model_enums: Tuple[ModelEnumValue] = ()
-    """Перечень дополнительных значений RegionalDataMartModelEnum, 
+    """Перечень дополнительных значений RegionalDataMartModelEnum,
     которые участвуют в формировании записей сущностей"""
 
     title: str

{edu_rdm_integration-2.0.2.dist-info → edu_rdm_integration-2.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edu-rdm-integration
-Version: 2.0.2
+Version: 2.1.0
 Summary: Интеграция с Региональной витриной данных
 Home-page: 
 Download-URL: 
@@ -16,11 +16,9 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Intended Audience :: Developers
 Classifier: Environment :: Console
-Classifier: Framework :: Django :: 1.11
-Classifier: Framework :: Django :: 2.0
-Classifier: Framework :: Django :: 2.1
 Classifier: Framework :: Django :: 2.2
 Classifier: Framework :: Django :: 3.0
+Classifier: Framework :: Django :: 3.1
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: packaging <24,>=21.3
@@ -28,11 +26,12 @@ Requires-Dist: pip <24,>=20.1.1
 Requires-Dist: setuptools <69,>=47.3.1
 Requires-Dist: wheel <0.42,>=0.37.1
 Requires-Dist: transliterate <2
-Requires-Dist: Django <3.1,>=1.11
+Requires-Dist: Django <3.2,>=2.2
 Requires-Dist: celery <5.3,>=4.4.7
-Requires-Dist: educommon <4,>=3.8.1
+Requires-Dist: educommon <4,>=3.9.3
 Requires-Dist: function-tools <1,>=0.9.0
 Requires-Dist: m3-db-utils <1,>=0.3.10
+Requires-Dist: m3-django-compat <2,>=1.10.2
 Requires-Dist: uploader-client <1,>=0.2.1
 
 # Проект "Интеграция с Региональной витриной данных (РВД)"
@@ -295,6 +294,26 @@ Requires-Dist: uploader-client <1,>=0.2.1
 ### Удалено
 
 
+## [2.1.0] - 2024-03-18
+
+Добавлена поддержка Django 3.1.
+
+### Добавлено
+
+- [EDUSCHL-18052](https://jira.bars.group/browse/EDUSCHL-18052)
+  MINOR Поднять версию Django до 3.1.14
+
+
+## [2.0.3] - 2024-03-11
+
+Добавлено сохранение чанка логов в `list` перед его использованием в запускаемых классах в методе `_get_runnable_objects` класса `BaseCollectingDataRunner`.
+
+### Исправлено
+
+- [EDUSCHL-21581](https://jira.bars.group/browse/EDUSCHL-21581)
+  PATCH Добавлено сохранение чанка логов в `list` перед его использованием в запускаемых классах в методе `_get_runnable_objects` класса `BaseCollectingDataRunner`.
+
+
 ## [2.0.2] - 2024-03-07
 
 Откатил изменения сделанные в версии 2.0.1. Данные доработки приводили к невозможности отправить данные.

{edu_rdm_integration-2.0.2.dist-info → edu_rdm_integration-2.1.0.dist-info}/RECORD

@@ -33,15 +33,15 @@ edu_rdm_integration/adapters/validators.py,sha256=LJWnCY8PtXDOj-fm3fBWjQYsHsSLfy
 edu_rdm_integration/collect_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/collect_data/collect.py,sha256=TfjDD25opR6UlV6oWbMXs3T7nQguSg5IT0k2oFasWJI,14543
 edu_rdm_integration/collect_data/generators.py,sha256=f34AAwdEcQNIokX0ypqYgjRD1XolwBVLER_HYv9ibNw,9075
-edu_rdm_integration/collect_data/helpers.py,sha256=pthYW-ugOww5TveWxONYcJby2VwWG6goJwbdTkNdVUU,3009
-edu_rdm_integration/collect_data/tests.py,sha256=vAvNRe23ep2JsBcEE0VjoOqwgFN3QmKE552iZgvbWdM,5378
+edu_rdm_integration/collect_data/helpers.py,sha256=gAFZAm9YhMtQhvlwSF3LMthPPa8LsqG_zbVe7vnW_Ag,2995
+edu_rdm_integration/collect_data/tests.py,sha256=-UNX3-GL0H9i89GXRfICT0ABltn_9aN_I_cmn1gQcDA,5367
 edu_rdm_integration/collect_data/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/collect_data/base/caches.py,sha256=XPMVZSgR8vRhCHmHsnUKy86rEIPUQXHz0wJabovPyfU,2170
 edu_rdm_integration/collect_data/base/functions.py,sha256=E1vYmC8F8NM5cBB5SGQEpluHrMynpjf3Ek3s0HsbxwY,2998
 edu_rdm_integration/collect_data/base/helpers.py,sha256=ONbPEELI_9ImpqCLrdIL3kb9aIQ2xQcF6XMa2C5KlDw,1017
 edu_rdm_integration/collect_data/base/managers.py,sha256=JKPa802xH_ZhrUUlGbLWQKWITy0y8vD3dSevYeqiYDg,6172
 edu_rdm_integration/collect_data/base/mixins.py,sha256=B1QwXddGnSDmRh5aKtpr-maGqnO_dg5CCwCnk_Y3PgQ,8521
-edu_rdm_integration/collect_data/base/runners.py,sha256=GJdcY5zaEb1ycPIP1mlhZHRvD8ihux-N6YVQk6Iw4Cg,1533
+edu_rdm_integration/collect_data/base/runners.py,sha256=Mf5Lux6IWWqKd798v149OjqfBWiDtigeFd701HSRBGg,1565
 edu_rdm_integration/collect_data/calculated/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/collect_data/calculated/strategies.py,sha256=W9f-MlLENSoa9jHMLWTP7ktZL-7FVtkt2FLXrbmds-o,7629
 edu_rdm_integration/collect_data/calculated/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -75,7 +75,7 @@ edu_rdm_integration/collect_data/non_calculated/base/strings.py,sha256=-k9dex8A7
 edu_rdm_integration/collect_data/non_calculated/base/tests.py,sha256=MoRY-a75Ow-7EjeQYxkXWunwqTGuBMaUyEkEV2oy05I,59
 edu_rdm_integration/collect_data/non_calculated/base/validators.py,sha256=0YvnfrfK1iFcZVSB-M-Xv82tIjYxEU_BwLofAEuGVW4,973
 edu_rdm_integration/enum_register/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration/enum_register/mixins.py,sha256=shLb8-9ySoY9kK1Wzb46I9wRKglQIemJess2uafjngE,4030
+edu_rdm_integration/enum_register/mixins.py,sha256=nmHue9-9bqKZn9_MFiL0E-5wBUBIZPZwk3DWVir5pKk,4021
 edu_rdm_integration/enum_register/register.py,sha256=5OWOjK-M0Erd_5CENpBaXhVtfL0pEaDl3Bev5QKNDJc,2218
 edu_rdm_integration/export_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/export_data/consts.py,sha256=Z6Uho8oViMc0t1tyQFZfrPFBwPx6KnhUf_iZ0qgob8o,16
@@ -156,9 +156,9 @@ edu_rdm_integration/uploader_log/apps.py,sha256=tYJj4-sDlq8fLOSvw18L_yys7SILpTKW
 edu_rdm_integration/uploader_log/enums.py,sha256=rgSO3BL2rh2xpfm0Pt4waQW8fB1VMJLdsGmr3SXwH_U,266
 edu_rdm_integration/uploader_log/managers.py,sha256=y5wTSMzF9hpOpIU_A7nIafL_LBU3QEie6LAYWoB-pBQ,3203
 edu_rdm_integration/uploader_log/ui.py,sha256=YM9Buqp2wxE95Wf5gvAATBzuYzDOossK1sEmvFk07cI,2110
-edu_rdm_integration-2.0.2.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-2.0.2.dist-info/METADATA,sha256=z6ocX18IpHNWnr16tkFD3vkqpV3_3RV9fEVepWx-nMs,56345
-edu_rdm_integration-2.0.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-edu_rdm_integration-2.0.2.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-edu_rdm_integration-2.0.2.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-2.0.2.dist-info/RECORD,,
+edu_rdm_integration-2.1.0.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-2.1.0.dist-info/METADATA,sha256=ji5SEODXhqO13VaW0Pz8k2dwn6RsQEU-z1Czk48DaCQ,57138
+edu_rdm_integration-2.1.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+edu_rdm_integration-2.1.0.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+edu_rdm_integration-2.1.0.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-2.1.0.dist-info/RECORD,,