Merge remote-tracking branch 'upstream/main' into b-2592-move-mod-not…

…es-to-los

dev/requirements.txt

@@ -1,10 +1,10 @@
 autoflake==2.3.1
-black==24.8.0
+black==24.10.0
 flake8==7.1.1
 isort==5.13.2
-mypy==1.11.2
+mypy==1.12.0
 pytest==8.3.3
-pyupgrade==3.17.0
+pyupgrade==3.18.0
 pyyaml==6.0.2
 simplejson==3.19.3
 

models.yml

@@ -1119,11 +1119,6 @@ meeting:
     to: motion_workflow/default_amendment_workflow_meeting_id
     required: true
     restriction_mode: B
-  motions_default_statute_amendment_workflow_id:
-    type: relation
-    to: motion_workflow/default_statute_amendment_workflow_meeting_id
-    required: true
-    restriction_mode: B
   motions_preamble:
     type: text
     default: "The assembly may decide:"
@@ -1180,9 +1175,6 @@ meeting:
     type: number
     minimum: 1
     restriction_mode: B
-  motions_statute_recommendations_by:
-    type: string
-    restriction_mode: B
   motions_recommendation_text_mode:
     type: string
     enum:
@@ -1215,10 +1207,6 @@ meeting:
     type: boolean
     default: False
     restriction_mode: B
-  motions_statutes_enabled:
-    type: boolean
-    default: False
-    restriction_mode: B
   motions_amendments_enabled:
     type: boolean
     default: True
@@ -1602,11 +1590,6 @@ meeting:
     to: motion_workflow/meeting_id
     on_delete: CASCADE
     restriction_mode: B
-  motion_statute_paragraph_ids:
-    type: relation-list
-    to: motion_statute_paragraph/meeting_id
-    on_delete: CASCADE
-    restriction_mode: B
   motion_comment_ids:
     type: relation-list
     to: motion_comment/meeting_id
@@ -2649,11 +2632,6 @@ motion:
     on_delete: CASCADE
     equal_fields: meeting_id
     restriction_mode: C
-  statute_paragraph_id:
-    type: relation
-    to: motion_statute_paragraph/motion_ids
-    equal_fields: meeting_id
-    restriction_mode: C
   comment_ids:
     type: relation-list
     to: motion_comment/motion_id
@@ -3174,51 +3152,13 @@ motion_workflow:
     type: relation
     to: meeting/motions_default_amendment_workflow_id
     restriction_mode: A
-  default_statute_amendment_workflow_meeting_id:
-    type: relation
-    to: meeting/motions_default_statute_amendment_workflow_id
-    restriction_mode: A
   meeting_id:
     type: relation
     to: meeting/motion_workflow_ids
     required: true
     restriction_mode: A
     constant: true
 
-motion_statute_paragraph:
-  id:
-    *id_field
-  title:
-    type: string
-    required: true
-    restriction_mode: A
-  text:
-    type: HTMLStrict
-    restriction_mode: A
-  weight:
-    type: number
-    default: 10000
-    restriction_mode: A
-  sequential_number:
-    type: number
-    description: The (positive) serial number of this model in its meeting. This number is auto-generated and read-only.
-    read_only: true
-    required: true
-    restriction_mode: A
-    constant: true
-
-  motion_ids:
-    type: relation-list
-    to: motion/statute_paragraph_id
-    equal_fields: meeting_id
-    restriction_mode: A
-  meeting_id:
-    type: relation
-    to: meeting/motion_statute_paragraph_ids
-    required: true
-    restriction_mode: A
-    constant: true
-
 poll:
   id:
     *id_field