educommon 3.8.1__py3-none-any.whl → 3.8.2__py3-none-any.whl

educommon/django/db/validators/simple.py

@@ -932,12 +932,28 @@ class HouseValidator(RegexValidator):
     Эти дома относятся к "специальным" зданиям, хоз. помещениям на закрытых
     территориях (заводы, склады), гаражам и т.д.
     Если нужно будет, что бы они так же считались валидными,
-    то регулярку нужно будет расширить до '^[0-9IVXа-яё/"_,.-]{1,20}$'
+    то регулярку нужно будет расширить до
+    '^(?=.{,20}$)([0-9IVXА-ЯЁа-яё"/_,.-]{1,} ?){1,}\b$'
     """
-    regex = re.compile(r'^[0-9а-яё/"_,.-]{0,12}$', re.IGNORECASE | re.UNICODE)
+    regex = re.compile(
+        r'^(?=.{,12}$)([0-9а-яё"/_,.-]{1,} ?){1,}\b$',
+        re.IGNORECASE | re.UNICODE
+    )
     message = 'Неверно указан номер дома'
 
 
+regex_house_validator = HouseValidator()
+
+
+def house_validator(value):
+    value = str(value)
+
+    regex_house_validator(value)
+
+
+is_house_number_valid = partial(validate_value, validator=house_validator)
+
+
 class BuildingValidator(RegexValidator):
     """Валидатор номера корпуса дома."""
     regex = re.compile(r'^[0-9а-яё/_.-]{0,10}$', re.IGNORECASE | re.UNICODE)

educommon/version.conf

@@ -4,8 +4,8 @@
 # нормальной установки обновлений.
 
 [version]
-BRANCH = tags/3.8.1^0
-VERSION = 3.8.1
-REVISION = bd7c73b5eddcc7990ea10c1a2cdde1bbe1c86fb8
-VERSION_DATE = 02.02.2024
-REVISION_DATE = 02.02.2024
+BRANCH = tags/3.8.2^0
+VERSION = 3.8.2
+REVISION = d04e2e448a6c1650c844fb68c311f296f6944a61
+VERSION_DATE = 06.02.2024
+REVISION_DATE = 06.02.2024

{educommon-3.8.1.dist-info → educommon-3.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: educommon
-Version: 3.8.1
+Version: 3.8.2
 Summary: Общая кодовая база для проектов БЦ Образование
 Home-page: https://stash.bars-open.ru/projects/EDUBASE/repos/educommon
 Author: BARS Group

{educommon-3.8.1.dist-info → educommon-3.8.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 educommon/__init__.py,sha256=fvsBDL7g8HgOTd-JHOh7TSvMcnUauvGVgPuyA2Z9hUI,419
 educommon/thread_data.py,sha256=n0XtdesP9H92O3rJ8K6fVnJLiHqyJEfh2xpuT36wzxs,61
-educommon/version.conf,sha256=kLeLekqxOc0s606Zny7LlAmSSXlahOb8qqpSfPgtXMI,450
+educommon/version.conf,sha256=ILdztASJn7UgrupbMF5zFiUVtcTAs6m1s2iqLD883iA,450
 educommon/about/README.rst,sha256=U48UW5jv-8qHyaV56atzzkNMvzHKXVcWSb_NR06PnMo,2685
 educommon/about/__init__.py,sha256=H1W0IgW-qX9LCZ49GOJzHdmQGHhh-MA6U1xmNx7WnfM,132
 educommon/about/apps.py,sha256=GrpJAOE2sF0ukWsqugP_WJS88DO4aL-T3kTLprrJrcA,259
@@ -159,7 +159,7 @@ educommon/django/db/partitioning/management/commands/apply_partitioning.py,sha25
 educommon/django/db/partitioning/management/commands/clear_table.py,sha256=Dt1u4Q35dz-W39sW1UYIQjdGyI7URJl6Z96qJOJYTbA,2235
 educommon/django/db/partitioning/management/commands/split_table.py,sha256=AfsBKWyW2yYYc05LGHdfULwW6GvaB6LXMBblSsxfg30,2082
 educommon/django/db/validators/__init__.py,sha256=Hyx-L4suVzUuCEb-HQB9g8LnaxKQp2ymv-DtaOW6qbw,1986
-educommon/django/db/validators/simple.py,sha256=my8K9FzbricSbSWbfZGwg8bFcvqmXcWaPOIXHQl8o3Q,38608
+educommon/django/db/validators/simple.py,sha256=cwG-OLVPdD146A9dzLOaGyzZOoUWgQoFu9KDQ7_k8xI,38886
 educommon/django/storages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 educommon/django/storages/atcfs/README.rst,sha256=yPy55jjKmSVL6Sg1LHzg_6wI7UAG4JDI6rjqaVxQfWs,2656
 educommon/django/storages/atcfs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -341,8 +341,8 @@ educommon/ws_log/smev/exceptions.py,sha256=lmy7o2T3dJkqgIhG07qyh5yPqO3qZAYABuT4J
 educommon/ws_log/templates/report/smev_logs.xlsx,sha256=nnYgB0Z_ix8HoxsRICjsZfFRQBdra-5Gd8nWhCxTjYg,10439
 educommon/ws_log/templates/ui-js/smev-logs-list-window.js,sha256=AGup3D8GTJSY9WdDPj0zBJeYQBFOmGgcbxPOJbKK-nY,513
 educommon/ws_log/templates/ui-js/smev-logs-report-setting-window.js,sha256=nQ7QYK9frJcE7g7kIt6INg9TlEEJAPPayBJgRaoTePA,1103
-educommon-3.8.1.dist-info/METADATA,sha256=tzBktFGEJPG-Scc0u7G-GYBQS2zbU9v1gHvS145PUFw,1450
-educommon-3.8.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-educommon-3.8.1.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
-educommon-3.8.1.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
-educommon-3.8.1.dist-info/RECORD,,
+educommon-3.8.2.dist-info/METADATA,sha256=Q9heCg3X0oaqx1nQDOt0ewJgnRPYU4fDyhQdtnB0uy4,1450
+educommon-3.8.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+educommon-3.8.2.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
+educommon-3.8.2.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
+educommon-3.8.2.dist-info/RECORD,,